Skip to content

Commit

Permalink
drm/i915/skl: port A fuse straps don't work on early SKL steppings
Browse files Browse the repository at this point in the history
So try to enumerate eDP unconditionally in those cases.

Signed-off-by: Jesse Barnes <[email protected]>
[danvet: Add wa tag Damien dug out.]
Reviewed-by: Damien Lespiau <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
  • Loading branch information
jbarnes993 authored and danvet committed Mar 17, 2015
1 parent 1d2b952 commit de31fac
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -12583,10 +12583,15 @@ static void intel_setup_outputs(struct drm_device *dev)
if (HAS_DDI(dev)) {
int found;

/* Haswell uses DDI functions to detect digital outputs */
/*
* Haswell uses DDI functions to detect digital outputs.
* On SKL pre-D0 the strap isn't connected, so we assume
* it's there.
*/
found = I915_READ(DDI_BUF_CTL_A) & DDI_INIT_DISPLAY_DETECTED;
/* DDI A only supports eDP */
if (found)
/* WaIgnoreDDIAStrap: skl */
if (found ||
(IS_SKYLAKE(dev) && INTEL_REVID(dev) < SKL_REVID_D0))
intel_ddi_init(dev, PORT_A);

/* DDI B, C and D detection is indicated by the SFUSE_STRAP
Expand Down

0 comments on commit de31fac

Please sign in to comment.