From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH] drm/i915: don't try and probe dpcd if we have no dp configured Date: Fri, 1 Aug 2014 20:47:13 +1000 Message-ID: <1406890033-29642-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id AD3D089CD8 for ; Fri, 1 Aug 2014 03:51:34 -0700 (PDT) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s71ApYXs006816 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 1 Aug 2014 06:51:34 -0400 Received: from optimus.redhat.com (vpn1-49-184.bne.redhat.com [10.64.49.184]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s71ApW9c008341 for ; Fri, 1 Aug 2014 06:51:33 -0400 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On hsw/bdw VBT can signal no DP on a digital connector, so when we get a hotplug irq in that situation, don't continue if we haven't actually got a DP output register configured. This fixes an oops where the aux mutex isn't initialised. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81856 Reported-by: lei.a.liu@intel.com Signed-off-by: Dave Airlie --- drivers/gpu/drm/i915/intel_dp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index e7a7953..691d169 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3966,6 +3966,9 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) if (!ibx_digital_port_connected(dev_priv, intel_dig_port)) goto mst_fail; + if (!intel_dp->output_reg) + goto mst_fail; + if (!intel_dp_get_dpcd(intel_dp)) { goto mst_fail; } -- 1.9.3