Skip to contentSkip to conversation

drm/i915/glk: Don't allow 12 bpc when htotal is too big

PATCH In review Ander Conselvan de Oliveira 5 participants 7 messages Apr 24, 2017 – Apr 26, 2017

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

PATCH 1/1 drm/i915/glk: Don't allow 12 bpc when htotal is too big

Display workaround #1139 for Geminilake instructs us to restrict HDMI to 8 bpc when htotal is greater than 5460. Otherwise, the pipe is unable to generate a proper signal and is left in a state where corruption is seen with other modes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100440

---
 drivers/gpu/drm/i915/intel_hdmi.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
index 6efc3cb..52f0b2d 100644
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
 			return false;
 	}
 
+	/* Display Wa #1139 */
+	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+	    crtc_state->base.adjusted_mode.htotal > 5460)
+		return false;
+
 	return true;
 }
 
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 8 lines · Ander Conselvan de Oliveira

Display workaround #1139 for Geminilake instructs us to restrict HDMI to 8 bpc when htotal is greater than 5460. Otherwise, the pipe is unable to generate a proper signal and is left in a state where corruption is seen with other modes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100440

Perhaps this should have

Fixes 14292b7ff86f ("drm/i915: allow HDMI 2.0 clock rates")

since it is only after that patch that the issue would be exposed, even though is not the cause for it. Jani?

Ander

Quoted 10 lines
---
 drivers/gpu/drm/i915/intel_hdmi.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 6efc3cb..52f0b2d 100644
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
 			return false;

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) · line 1337

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
 	}
 
+	/* Display Wa #1139 */
+	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+	    crtc_state->base.adjusted_mode.htotal > 5460)
+		return false;
+
 	return true;
 }
 

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

#2 lore raw
Quoted 10 lines · Ander Conselvan De Oliveira
Quoted 8 lines · Ander Conselvan de Oliveira

Display workaround #1139 for Geminilake instructs us to restrict HDMI to 8 bpc when htotal is greater than 5460. Otherwise, the pipe is unable to generate a proper signal and is left in a state where corruption is seen with other modes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100440

Quoted 6 lines

Perhaps this should have

Fixes 14292b7ff86f ("drm/i915: allow HDMI 2.0 clock rates")

since it is only after that patch that the issue would be exposed, even though is not the cause for it. Jani?

I don't mind/care too much either way, because it's only GLK <= A1.

BR,
Jani.

Quoted 23 lines

Ander

Quoted 20 lines
---
 drivers/gpu/drm/i915/intel_hdmi.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
index 6efc3cb..52f0b2d 100644
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
 			return false;
 	}
 
+	/* Display Wa #1139 */
+	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+	    crtc_state->base.adjusted_mode.htotal > 5460)
+		return false;
+
 	return true;
 }
 
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#3 lore raw
In reply to Ander Conselvan de Oliveira

Regards

Shashank

Quoted 17 lines · Ander Conselvan de Oliveira

Display workaround #1139 for Geminilake instructs us to restrict HDMI to 8 bpc when htotal is greater than 5460. Otherwise, the pipe is unable to generate a proper signal and is left in a state where corruption is seen with other modes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100440

---
  drivers/gpu/drm/i915/intel_hdmi.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 6efc3cb..52f0b2d 100644

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) · line 1332

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
  			return false;
  	}
 
+	/* Display Wa #1139 */
+	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+	    crtc_state->base.adjusted_mode.htotal > 5460)

Small inputs:
- We might wanna extend this for CNL too, as the WAR is valid for it too. I am not sure it should be this same patch or not.
- We need to modify this check not to affect the YCBCR 420 modes, as there won't be any change between the timings of a YCBCR mode and a normal mode (apart from a flag), but htotal should be valid in YCBCR
420 case. But I can handle this part while sending second patch set of
YCBCR 420 handling.
- Also, should we reject 12BPC totally, or just clamp htotal to max possible (5460) and go ahead? Ville ?

In any case, please feel free to use:

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) · line 1337

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+		return false;
+
  	return true;
  }
 

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

#4 lore raw
Quoted 26 lines · Shashank

Regards

Shashank

Quoted 20 lines · Ander Conselvan de Oliveira

Display workaround #1139 for Geminilake instructs us to restrict HDMI to 8 bpc when htotal is greater than 5460. Otherwise, the pipe is unable to generate a proper signal and is left in a state where corruption is seen with other modes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100440

---
  drivers/gpu/drm/i915/intel_hdmi.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 6efc3cb..52f0b2d 100644
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
  			return false;
  	}
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) · line 1332

Quoted 3 lines
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
+	/* Display Wa #1139 */
+	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+	    crtc_state->base.adjusted_mode.htotal > 5460)

Small inputs:
- We might wanna extend this for CNL too, as the WAR is valid for it too. I am not sure it should be this same patch or not.

None of the CNL patches landed yet, so I think we should include this in the patch/series that enables hdmi 2.0 clocks for it.

Quoted 5 lines

- We need to modify this check not to affect the YCBCR 420 modes, as there won't be any change between the timings of a YCBCR mode and a normal mode (apart from a flag), but htotal should be valid in YCBCR
420 case. But I can handle this part while sending second patch set of
YCBCR 420 handling.

Thanks.

Quoted 2 lines

- Also, should we reject 12BPC totally, or just clamp htotal to max possible (5460) and go ahead? Ville ?

Since this is only up to GLK A1, I don't think it is worth the trouble.

Ander

Quoted 13 lines

In any case, please feel free to use:

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) · line 1337

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+		return false;
+
  	return true;
  }
 

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

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

#5 lore raw

✓ Fi.CI.BAT: success for drm/i915/glk: Don't allow 12 bpc when htotal is too big

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: drm/i915/glk: Don't allow 12 bpc when htotal is too big
URL : https://patchwork.freedesktop.org/series/23451/
State : success

== Summary ==

Series 23451v1 drm/i915/glk: Don't allow 12 bpc when htotal is too big
https://patchwork.freedesktop.org/api/1.0/series/23451/revisions/1/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                fail       -> PASS       (fi-snb-2600) fdo#100007

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:429s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:430s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:576s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:506s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time:564s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:493s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:415s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:410s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:425s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:494s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:464s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:461s
fi-kbl-7560u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:562s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:450s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time:575s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:457s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:497s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:429s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:529s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:398s

9fb4b60bfa8c532ad6eda05af002c6b2f090d97f drm-tip: 2017y-04m-24d-09h-40m-53s UTC integration manifest 7fa2f63 drm/i915/glk: Don't allow 12 bpc when htotal is too big

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4536/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Re: ✓ Fi.CI.BAT: success for drm/i915/glk: Don't allow 12 bpc when htotal is too big

Quoted 5 lines · Patchwork

== Series Details ==

Series: drm/i915/glk: Don't allow 12 bpc when htotal is too big
URL : https://patchwork.freedesktop.org/series/23451/
State : success

Pushed, thanks for reviewing.

Ander

Quoted 37 lines

== Summary ==

Series 23451v1 drm/i915/glk: Don't allow 12 bpc when htotal is too big
https://patchwork.freedesktop.org/api/1.0/series/23451/revisions/1/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                fail       -> PASS       (fi-snb-2600) fdo#100007

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:429s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:430s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:576s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:506s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time:564s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:493s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:415s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:410s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:425s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:494s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:464s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:461s
fi-kbl-7560u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:562s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:450s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time:575s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:457s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:497s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:429s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:529s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:398s

9fb4b60bfa8c532ad6eda05af002c6b2f090d97f drm-tip: 2017y-04m-24d-09h-40m-53s UTC integration manifest 7fa2f63 drm/i915/glk: Don't allow 12 bpc when htotal is too big

Quoted 7 lines

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4536/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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