From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE21BC2BB1D for ; Wed, 18 Mar 2020 00:04:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3BA120714 for ; Wed, 18 Mar 2020 00:04:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WZVZn217" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727212AbgCRAEe (ORCPT ); Tue, 17 Mar 2020 20:04:34 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:51207 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbgCRAEd (ORCPT ); Tue, 17 Mar 2020 20:04:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584489872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ZGul9wAdAsYKRs6DsvL3qGxyS9Wfr9NLLvWL1Wy7L4=; b=WZVZn217dsYf1b12WXJRrAao6q30ALGwA4LOeQBBDuaH5asWdkgzgSrgc2LQmlyNo29u9C hXUNIuVc+AwO4OWb/+A7YaLE7YtrClOlY7YeqwFlnmdntkVju9FR6zXd7QSK7oLZB4ZdH7 GGYEFKsJ5F+3GiswTGMoMo6fZXDyrro= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-PKDNyvXWM0KupGYUccKZuw-1; Tue, 17 Mar 2020 20:04:28 -0400 X-MC-Unique: PKDNyvXWM0KupGYUccKZuw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DA8F1137840; Wed, 18 Mar 2020 00:04:27 +0000 (UTC) Received: from whitewolf.redhat.com (ovpn-113-173.rdu2.redhat.com [10.10.113.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3C3B5DA81; Wed, 18 Mar 2020 00:04:26 +0000 (UTC) From: Lyude Paul To: nouveau@lists.freedesktop.org Cc: Ben Skeggs , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/nouveau/connector: Fix DDC error when probing force-disabled connectors Date: Tue, 17 Mar 2020 20:04:23 -0400 Message-Id: <20200318000423.205005-2-lyude@redhat.com> In-Reply-To: <20200318000423.205005-1-lyude@redhat.com> References: <20200318000423.205005-1-lyude@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/dr= m/nouveau/nouveau_connector.c index 0d42a7e5deff..9fb00c4b9764 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -550,6 +550,9 @@ nouveau_connector_detect(struct drm_connector *connec= tor, bool force) int ret; enum drm_connector_status conn_status =3D connector_status_disconnected= ; =20 + if (connector->force =3D=3D DRM_FORCE_OFF) + return conn_status; + /* Cleanup the previous EDID block. */ if (nv_connector->edid) { drm_connector_update_edid_property(connector, NULL); --=20 2.24.1