From: Matt Roper <matthew.d.roper@intel.com> To: Lucas De Marchi <lucas.demarchi@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Date: Wed, 13 Nov 2019 08:23:56 -0800 [thread overview] Message-ID: <20191113162356.GR21445@mdroper-desk1.amr.corp.intel.com> (raw) In-Reply-To: <20191113021935.41547-1-lucas.demarchi@intel.com> On Tue, Nov 12, 2019 at 06:19:35PM -0800, Lucas De Marchi wrote: > Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT > says regarding HDMI to workaround broken VBTs, see commit > 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply > gen12+ so they inherit the TGL behavior. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 2 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 7c0ca733bef8..e6da98729e1f 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, > 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) { > + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) { > DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n", > is_hdmi ? "/HDMI" : ""); > is_dvi = false; > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index ed4a68fb351f..659a03b08849 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n", > intel_encoder->base.base.id, intel_encoder->base.name); > > - if (WARN_ON(port == PORT_A)) > + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A)) > return; > > if (WARN(intel_dig_port->max_lanes < 4, > -- > 2.24.0 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Matt Roper <matthew.d.roper@intel.com> To: Lucas De Marchi <lucas.demarchi@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Date: Wed, 13 Nov 2019 08:23:56 -0800 [thread overview] Message-ID: <20191113162356.GR21445@mdroper-desk1.amr.corp.intel.com> (raw) Message-ID: <20191113162356.SkAvuIfEf49GWrC21bOIyOepTAVyIiMsPD2ffPfvqvA@z> (raw) In-Reply-To: <20191113021935.41547-1-lucas.demarchi@intel.com> On Tue, Nov 12, 2019 at 06:19:35PM -0800, Lucas De Marchi wrote: > Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT > says regarding HDMI to workaround broken VBTs, see commit > 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply > gen12+ so they inherit the TGL behavior. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 2 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 7c0ca733bef8..e6da98729e1f 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, > 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) { > + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) { > DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n", > is_hdmi ? "/HDMI" : ""); > is_dvi = false; > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index ed4a68fb351f..659a03b08849 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n", > intel_encoder->base.base.id, intel_encoder->base.name); > > - if (WARN_ON(port == PORT_A)) > + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A)) > return; > > if (WARN(intel_dig_port->max_lanes < 4, > -- > 2.24.0 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-13 16:22 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi 2019-11-13 2:19 ` [Intel-gfx] " Lucas De Marchi 2019-11-13 2:25 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2019-11-13 2:25 ` [Intel-gfx] " Patchwork 2019-11-13 2:50 ` ✗ Fi.CI.BAT: failure " Patchwork 2019-11-13 2:50 ` [Intel-gfx] " Patchwork 2019-11-13 16:23 ` Matt Roper [this message] 2019-11-13 16:23 ` [Intel-gfx] [PATCH] " Matt Roper 2019-11-14 12:43 ` Jani Nikula 2019-11-14 12:43 ` [Intel-gfx] " Jani Nikula 2019-11-14 17:31 ` Lucas De Marchi 2019-11-14 17:31 ` [Intel-gfx] " Lucas De Marchi
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=20191113162356.GR21445@mdroper-desk1.amr.corp.intel.com \ --to=matthew.d.roper@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=lucas.demarchi@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.