Skip to contentSkip to conversation

drm/i915: follow single notation for workaround number

PATCH Superseded Lucas De Marchi 3 participants 8 messages Nov 28, 2017 – Nov 30, 2017

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915: follow single notation for workaround number

---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c    | 2 +-
 drivers/gpu/drm/i915/intel_pm.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index 76c75d34e799..9a0ebf205435 100644
@@ -15126,7 +15126,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)
 
 static void intel_early_display_was(struct drm_i915_private *dev_priv)
 {
-	/* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */
+	/* Display WA #1185 WaDisableDARBFClkGating: cnl,glk */
 	if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
 		I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) |
 			   DARBF_GATING_DIS);
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
index 9d5e72728475..691600ce48c4 100644
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display Wa #1139 */
+	/* Display WA #1139 */
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
 		return false;
drivers/gpu/drm/i915/intel_pm.c +1 -1
index a80c322c5b43..7905b8313e40 100644
@@ -61,7 +61,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
 	if (HAS_LLC(dev_priv)) {
 		/*
 		 * WaCompressedResourceDisplayNewHashMode:skl,kbl
-		 * Display WA#0390: skl,kbl
+		 * Display WA #0390: skl,kbl
 		 *
 		 * Must match Sampler, Pixel Back End, and Media. See
 		 * WaCompressedResourceSamplerPbeMediaNewHashMode.
Signature · 6 lines
2.14.3

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

PATCH 2/2 drm/i915: add platform tag to WA

---
 drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
index 691600ce48c4..c42a6c672b73 100644
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display WA #1139 */
+	/* Display WA #1139: glk */
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
 		return false;
Signature · 6 lines
2.14.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] drm/i915: add platform tag to WA

Quoted 11 lines · Lucas De Marchi
---
 drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 691600ce48c4..c42a6c672b73 100644

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

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display WA #1139 */
+	/* Display WA #1139: glk */

Ah! ops... it is here! ;)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
 		return false;
Signature · 6 lines
2.14.3

_______________________________________________
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

#3 lore raw

✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: follow single notation for workaround number

In reply to Lucas De Marchi
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915: follow single notation for workaround number
URL : https://patchwork.freedesktop.org/series/34563/
State : success

== Summary ==

Series 34563v1 series starting with [1/2] drm/i915: follow single notation for workaround number
https://patchwork.freedesktop.org/api/1.0/series/34563/revisions/1/mbox/

Test gem_exec_reloc:

        Subgroup basic-gtt-cpu-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +2

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

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:440s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:438s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:383s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:503s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:279s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:501s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:502s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:485s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:468s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:428s
fi-gdg-551       total:288  pass:175  dwarn:1   dfail:0   fail:4   skip:108 time:278s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:537s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:382s
fi-hsw-4770r     total:288  pass:224  dwarn:0   dfail:0   fail:0   skip:64  time:260s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:424s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:470s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:487s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:525s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:482s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:581s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:538s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:563s
fi-skl-6700k     total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:517s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:514s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:450s
fi-snb-2520m     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:547s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:419s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:609s
fi-cnl-y         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:557s
fi-glk-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:490s

5144438448829ec2a3d94fd16a9e69a52cfa7b3b drm-tip: 2017y-11m-28d-17h-04m-56s UTC integration manifest 0a09ce08ab58 drm/i915: add platform tag to WA
b22eefcbab09 drm/i915: follow single notation for workaround number

== Logs ==

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

#4 lore raw

✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: follow single notation for workaround number

In reply to Lucas De Marchi
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915: follow single notation for workaround number
URL : https://patchwork.freedesktop.org/series/34563/
State : success

== Summary ==

Blacklisted hosts:

shard-apl        total:2436 pass:1501 dwarn:22  dfail:16  fail:13  skip:877 time:11059s
shard-hsw        total:2635 pass:1515 dwarn:9   dfail:0   fail:10  skip:1100 time:8893s
shard-kbl        total:2414 pass:1604 dwarn:23  dfail:12  fail:15  skip:753 time:9101s
shard-snb        total:2583 pass:1248 dwarn:18  dfail:5   fail:7   skip:1302 time:7832s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7330/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#5 lore raw
In reply to Lucas De Marchi
Quoted 13 lines · Lucas De Marchi
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c    | 2 +-
 drivers/gpu/drm/i915/intel_pm.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 76c75d34e799..9a0ebf205435 100644

drivers/gpu/drm/i915/intel_display.c get_encoder_power_domains(struct drm_i915_private *dev_priv) · line 15129

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -15126,7 +15126,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)
 
 static void intel_early_display_was(struct drm_i915_private *dev_priv)
 {
-	/* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */
+	/* Display WA #1185 WaDisableDARBFClkGating: cnl,glk */

If you introduce the space here I believe this patch will need to get bigger. probably to just leave without it.

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

Quoted 13 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
 	if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
 		I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) |
 			   DARBF_GATING_DIS);
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
index 9d5e72728475..691600ce48c4 100644
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display Wa #1139 */
+	/* Display WA #1139 */

maybe good to add the affected platforms here as well?

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
 		return false;
drivers/gpu/drm/i915/intel_pm.c +1 -1
index a80c322c5b43..7905b8313e40 100644
@@ -61,7 +61,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
 	if (HAS_LLC(dev_priv)) {
 		/*
 		 * WaCompressedResourceDisplayNewHashMode:skl,kbl
-		 * Display WA#0390: skl,kbl
+		 * Display WA #0390: skl,kbl
 		 *
 		 * Must match Sampler, Pixel Back End, and Media. See
 		 * WaCompressedResourceSamplerPbeMediaNewHashMode.
Signature · 6 lines
2.14.3

_______________________________________________
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

#6 lore raw
Quoted 17 lines · Rodrigo Vivi
Quoted 16 lines · Lucas De Marchi
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c    | 2 +-
 drivers/gpu/drm/i915/intel_pm.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 76c75d34e799..9a0ebf205435 100644
@@ -15126,7 +15126,7 @@ get_encoder_power_domains(struct drm_i915_private
 *dev_priv)
 
Quoted 8 lines

drivers/gpu/drm/i915/intel_display.c get_encoder_power_domains(struct drm_i915_private *dev_priv) · line 15129

Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
 static void intel_early_display_was(struct drm_i915_private *dev_priv)
 {
-	/* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */
+	/* Display WA #1185 WaDisableDARBFClkGating: cnl,glk */

If you introduce the space here I believe this patch will need to get bigger.
probably to just leave without it.

Not from my grep. The ones that don't have space are the ones that don't have numbers either. Of course we could just ignore this and allow to either have spaces or not.

git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/

vs

git grep -i -e "WA \#" -- drivers/gpu/drm/i915/

... and this last one shows I forgot one case in
drivers/gpu/drm/i915/intel_pm.c

Lucas De Marchi

Quoted 41 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
 	if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
 		I915_WRITE(GEN9_CLKGATE_DIS_0,

I915_READ(GEN9_CLKGATE_DIS_0) |

drivers/gpu/drm/i915/intel_display.c +0 -0
 			   DARBF_GATING_DIS);
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 9d5e72728475..691600ce48c4 100644

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(const struct · line 1384

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct
 intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display Wa #1139 */
+	/* Display WA #1139 */

maybe good to add the affected platforms here as well?

Quoted 21 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 		return false;
drivers/gpu/drm/i915/intel_pm.c +1 -1
index a80c322c5b43..7905b8313e40 100644
@@ -61,7 +61,7 @@ static void gen9_init_clock_gating(struct
 drm_i915_private *dev_priv)
 	if (HAS_LLC(dev_priv)) {
 		/*
 		 * WaCompressedResourceDisplayNewHashMode:skl,kbl
-		 * Display WA#0390: skl,kbl
+		 * Display WA #0390: skl,kbl
 		 *
 		 * Must match Sampler, Pixel Back End, and Media. See

* WaCompressedResourceSamplerPbeMediaNewHashMode.

Signature · 1 line
2.14.3
Quoted 4 lines
Quoted 4 lines

_______________________________________________
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

maintainer
#7 lore raw
Quoted 27 lines · Lucas
Quoted 17 lines · Rodrigo Vivi
Quoted 16 lines · Lucas De Marchi
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c    | 2 +-
 drivers/gpu/drm/i915/intel_pm.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 76c75d34e799..9a0ebf205435 100644
@@ -15126,7 +15126,7 @@ get_encoder_power_domains(struct drm_i915_private
 *dev_priv)
 
Quoted 8 lines

drivers/gpu/drm/i915/intel_display.c get_encoder_power_domains(struct drm_i915_private *dev_priv) · line 15129

Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
 static void intel_early_display_was(struct drm_i915_private *dev_priv)
 {
-	/* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */
+	/* Display WA #1185 WaDisableDARBFClkGating: cnl,glk */

If you introduce the space here I believe this patch will need to get bigger.
probably to just leave without it.

Quoted 6 lines

Not from my grep. The ones that don't have space are the ones that don't have numbers either. Of course we could just ignore this and allow to either have spaces or not.

git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/

Well, using this I see

$ git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/ | wc -l
235

where only

$ git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/ | grep ": " | wc -l
9

have space.

So maybe it would be good to convert those 9 to match the most used style, i.e., no space.

Not that I have a strong preference actually. As far as we have the information about the platform, WaStrangeNameWhenTheyExist, and Display WA #<number>, I'm ok with it, no matter order or spaces ;)

Quoted 7 lines

vs

git grep -i -e "WA \#" -- drivers/gpu/drm/i915/

... and this last one shows I forgot one case in
drivers/gpu/drm/i915/intel_pm.c

so, if you insist on this format with space for the displays one I ack the v2 ;)

Quoted 45 lines

Lucas De Marchi

Quoted 41 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
 	if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
 		I915_WRITE(GEN9_CLKGATE_DIS_0,

I915_READ(GEN9_CLKGATE_DIS_0) |

drivers/gpu/drm/i915/intel_display.c +0 -0
 			   DARBF_GATING_DIS);
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 9d5e72728475..691600ce48c4 100644

drivers/gpu/drm/i915/intel_hdmi.c static bool hdmi_12bpc_possible(const struct · line 1384

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct
 intel_crtc_state *crtc_state)
 		}
 	}
 
-	/* Display Wa #1139 */
+	/* Display WA #1139 */

maybe good to add the affected platforms here as well?

Quoted 21 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
 	    crtc_state->base.adjusted_mode.htotal > 5460)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 		return false;
drivers/gpu/drm/i915/intel_pm.c +1 -1
index a80c322c5b43..7905b8313e40 100644
@@ -61,7 +61,7 @@ static void gen9_init_clock_gating(struct
 drm_i915_private *dev_priv)
 	if (HAS_LLC(dev_priv)) {
 		/*
 		 * WaCompressedResourceDisplayNewHashMode:skl,kbl
-		 * Display WA#0390: skl,kbl
+		 * Display WA #0390: skl,kbl
 		 *
 		 * Must match Sampler, Pixel Back End, and Media. See

* WaCompressedResourceSamplerPbeMediaNewHashMode.

Signature · 1 line
2.14.3
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

_______________________________________________
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