From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Dave Airlie <airlied@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
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 [thread overview]
Message-ID: <20140801110704.GU4193@intel.com> (raw)
In-Reply-To: <1406890033-29642-1-git-send-email-airlied@gmail.com>
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=81856
> Reported-by: lei.a.liu@intel.com
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> 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älä
Intel OTC
prev parent reply other threads:[~2014-08-01 11:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 10:47 [PATCH] drm/i915: don't try and probe dpcd if we have no dp configured Dave Airlie
2014-08-01 11:07 ` Ville Syrjälä [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140801110704.GU4193@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox