Skip to contentSkip to conversation

drm/i915/skl: port A fuse straps don't work on early SKL steppings

PATCH In review Jesse Barnes 4 participants 6 messages Mar 6, 2015 – Mar 9, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/skl: port A fuse straps don't work on early SKL steppings

So try to enumerate eDP unconditionally in those cases.

---
 drivers/gpu/drm/i915/intel_display.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -2
index 597c10b..8820e8a 100644
@@ -12563,10 +12563,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)
+		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
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Jesse Barnes

So try to enumerate eDP unconditionally in those cases.

That's WaIgnoreDDIAStrap, I assumed it actually worked since my eDP panel was detected... I see it listed without a stepping check but I guess you have a good source for that one.

So, maybe with the WaIgnoreDDIAStrap mention:

Signature · 1 line
Damien
Quoted 33 lines
---
 drivers/gpu/drm/i915/intel_display.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -2
index 597c10b..8820e8a 100644
@@ -12563,10 +12563,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)
+		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
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 10 lines · Damien Lespiau
Quoted 3 lines · Jesse Barnes

So try to enumerate eDP unconditionally in those cases.

That's WaIgnoreDDIAStrap, I assumed it actually worked since my eDP panel was detected... I see it listed without a stepping check but I guess you have a good source for that one.

So, maybe with the WaIgnoreDDIAStrap mention:

Done ...

Quoted 3 lines

and applied, thanks.
-Daniel

Quoted 40 lines
Signature · 1 line
Damien
Quoted 33 lines
---
 drivers/gpu/drm/i915/intel_display.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -2
index 597c10b..8820e8a 100644
@@ -12563,10 +12563,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)
+		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
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Damien Lespiau
Quoted 3 lines · Jesse Barnes

So try to enumerate eDP unconditionally in those cases.

That's WaIgnoreDDIAStrap, I assumed it actually worked since my eDP panel was detected... I see it listed without a stepping check but I guess you have a good source for that one.

Quoted 7 lines
Quoted 1 line

So, maybe with the WaIgnoreDDIAStrap mention:

Done ...

Quoted 3 lines

and applied, thanks.

Cool, thanks. I didn't see the wa named in the bspec (or even mentioned until I pinged Art); I suppose this one came from the wa db?

Thanks,
Jesse

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 13 lines · Jesse Barnes
Quoted 12 lines · Daniel Vetter
Quoted 10 lines · Damien Lespiau
Quoted 3 lines · Jesse Barnes

So try to enumerate eDP unconditionally in those cases.

That's WaIgnoreDDIAStrap, I assumed it actually worked since my eDP panel was detected... I see it listed without a stepping check but I guess you have a good source for that one.

So, maybe with the WaIgnoreDDIAStrap mention:

Quoted 8 lines
Quoted 5 lines

Done ...

Quoted 3 lines

and applied, thanks.

Cool, thanks. I didn't see the wa named in the bspec (or even mentioned until I pinged Art); I suppose this one came from the wa db?

Indeed.

Signature · 5 lines
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#5 lore raw
In reply to Jesse Barnes

Task id: 5909 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -5 275/275 270/275
ILK 307/307 307/307
SNB -1 284/284 283/284

IVB                                  375/375              375/375
BYT                                  294/294              294/294
HSW                                  385/385              385/385
BDW                 -3              314/314              311/314
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt_gen3_render_tiledx_blits      FAIL(1)PASS(6)      FAIL(1)NRUN(1)
 PNV  igt_gen3_render_tiledy_blits      FAIL(1)PASS(3)      FAIL(1)PASS(1)
 PNV  igt_gem_fence_thrash_bo-write-verify-threaded-none      FAIL(1)CRASH(1)PASS(1)      CRASH(1)PASS(1)
*PNV  igt_gem_partial_pwrite_pread_reads      PASS(2)      NRUN(1)PASS(1)
*PNV  igt_gem_userptr_blits_forked-unsync-multifd-mempressure-normal      PASS(2)      NRUN(1)
*SNB  igt_gem_fence_thrash_bo-write-verify-x      PASS(2)      DMESG_WARN(1)PASS(1)
*BDW  igt_drv_debugfs_reader      PASS(4)      DMESG_WARN(1)PASS(1)
*BDW  igt_drv_hangman_error-state-sysfs-entry      PASS(4)      TIMEOUT(1)PASS(1)
*BDW  igt_gem_gtt_hog      PASS(6)      DMESG_WARN(1)PASS(1)

Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx