From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: don't try and probe dpcd if we have no dp configured Date: Fri, 1 Aug 2014 14:07:04 +0300 Message-ID: <20140801110704.GU4193@intel.com> References: <1406890033-29642-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 957396E743 for ; Fri, 1 Aug 2014 04:09:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1406890033-29642-1-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Airlie Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Aug 01, 2014 at 08:47:13PM +1000, Dave Airlie wrote: > 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=3D81856 > 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; > + What about just not setting the hpd_pulse function pointer when it's not a DP connector? > if (!intel_dp_get_dpcd(intel_dp)) { > goto mst_fail; > } > -- = > 1.9.3 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC