diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-08-14 03:53:17 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-14 11:50:43 -0400 |
| commit | 5a2376d1360bfc9ebf3b554dd8db1922d42cee4b (patch) | |
| tree | 538fb3e9a38bb7b4043dc6f635d92d9936a09f8a /drivers/gpu/drm | |
| parent | f79b468eca20dae31b6fcaaa738a7f99b764837d (diff) | |
drm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A
There is currently conflicting documentation on which steppings the
workaround is needed, up to C vs. forever. However there is post-C
stepping hardware that doesn't report port presence on DDI A, leading to
black screen on eDP. Assume the strap isn't connected, and try to enable
DDI A on these machines. (We'll still check the VBT for the info in DDI
init.)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 082549ee2d07..91208e1f2f62 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -13945,8 +13945,7 @@ static void intel_setup_outputs(struct drm_device *dev) | |||
| 13945 | */ | 13945 | */ |
| 13946 | found = I915_READ(DDI_BUF_CTL_A) & DDI_INIT_DISPLAY_DETECTED; | 13946 | found = I915_READ(DDI_BUF_CTL_A) & DDI_INIT_DISPLAY_DETECTED; |
| 13947 | /* WaIgnoreDDIAStrap: skl */ | 13947 | /* WaIgnoreDDIAStrap: skl */ |
| 13948 | if (found || | 13948 | if (found || IS_SKYLAKE(dev)) |
| 13949 | (IS_SKYLAKE(dev) && INTEL_REVID(dev) < SKL_REVID_D0)) | ||
| 13950 | intel_ddi_init(dev, PORT_A); | 13949 | intel_ddi_init(dev, PORT_A); |
| 13951 | 13950 | ||
| 13952 | /* DDI B, C and D detection is indicated by the SFUSE_STRAP | 13951 | /* DDI B, C and D detection is indicated by the SFUSE_STRAP |
