diff options
| author | Imre Deak <imre.deak@intel.com> | 2018-12-20 16:52:11 +0100 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2019-01-31 15:31:22 +0100 |
| commit | 2b34e562361f6e440524272187432c551b57481e (patch) | |
| tree | c2dc72e72dd362d4954e074ead55e0099cca7ef3 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/icl: Add TypeC ports only if VBT is present (diff) | |
| download | linux-2b34e562361f6e440524272187432c551b57481e.tar.xz linux-2b34e562361f6e440524272187432c551b57481e.zip | |
drm/i915/icl: Work around broken VBTs for port F detection
VBT may include incorrect information about the presence of port F. Work
around this on SKUs where we know the port is not present.
v2:
- Fix IS_ICL_WITH_PORT_F, so it's useable from any context.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181220155211.31456-1-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b0bb8adcf26f..4424b4c90578 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14376,8 +14376,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) /* * On some ICL SKUs port F is not present. No strap bits for * this, so rely on VBT. + * Work around broken VBTs on SKUs known to have no port F. */ - if (intel_bios_is_port_present(dev_priv, PORT_F)) + if (IS_ICL_WITH_PORT_F(dev_priv) && + intel_bios_is_port_present(dev_priv, PORT_F)) intel_ddi_init(dev_priv, PORT_F); icl_dsi_init(dev_priv); |