From: Jani Nikula <jani.nikula@intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/bios: ignore HDMI on port A
Date: Mon, 25 Sep 2017 10:50:44 +0300 [thread overview]
Message-ID: <87k20n5i97.fsf@nikula.org> (raw)
In-Reply-To: <20170921145113.GK4914@intel.com>
On Thu, 21 Sep 2017, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Sep 21, 2017 at 05:19:20PM +0300, Jani Nikula wrote:
>> The hardware state readout oopses after several warnings when trying to
>> use HDMI on port A, if such a combination is configured in VBT. Filter
>> the combo out already at the VBT parsing phase.
>>
>> v2: also ignore DVI (Ville)
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102889
>> Cc: stable@vger.kernel.org
>> Cc: Imre Deak <imre.deak@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_bios.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 5949750a35ee..97931b294f9a 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1162,6 +1162,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
>> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>>
>> + if (port == PORT_A && is_dvi) {
>
> We may want to do the same for PORT_E. Although in that case we would
> already reject it in intel_hdmi_init_connector() since PORT_E can have
> max 2 lanes and HDMI needs 4. But looks like that would result in a WARN.
> Given that we've now seen a bogus VBT for port A I wouldn't put it past
> them to cook one up for port E as well.
>
> Either way
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Pushed to dinq with Tested-by from the bug, thanks for the review.
BR,
Jani.
>
>> + DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
>> + is_hdmi ? "/HDMI" : "");
>> + is_dvi = false;
>> + is_hdmi = false;
>> + }
>> +
>> info->supports_dvi = is_dvi;
>> info->supports_hdmi = is_hdmi;
>> info->supports_dp = is_dp;
>> --
>> 2.11.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
prev parent reply other threads:[~2017-09-25 7:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 13:11 [PATCH] drm/i915/bios: ignore HDMI on port A Jani Nikula
2017-09-21 13:16 ` [Intel-gfx] " Ville Syrjälä
2017-09-21 14:19 ` [PATCH v2] " Jani Nikula
2017-09-21 14:51 ` [Intel-gfx] " Ville Syrjälä
2017-09-25 7:50 ` Jani Nikula [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=87k20n5i97.fsf@nikula.org \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).