Skip to contentSkip to conversation

drm/i915/tgl: Add Wa_1409825376 to tgl

PATCH Superseded Radhakrishna Sripada 2 participants 3 messages Jan 9, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/tgl: Add Wa_1409825376 to tgl

Workaround database indicates we should disable VRH clockgating in pre-production hardware.

---
 drivers/gpu/drm/i915/i915_reg.h | 3 +++
 drivers/gpu/drm/i915/intel_pm.c | 5 +++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
index 6cc55c103f67..5215df17e7bd 100644
@@ -4124,6 +4124,9 @@ enum {
 #define   PWM2_GATING_DIS		(1 << 14)
 #define   PWM1_GATING_DIS		(1 << 13)
 
+#define GEN9_CLKGATE_DIS_3		_MMIO(0x46538)
+#define   TGL_VRH_GATING_DIS		(1 << 31)
+
 #define GEN9_CLKGATE_DIS_4		_MMIO(0x4653C)
 #define   BXT_GMBUS_GATING_DIS		(1 << 14)
 
drivers/gpu/drm/i915/intel_pm.c +5 -0
index 148ac455dfa7..0d71fc19d0ee 100644
@@ -6630,6 +6630,11 @@ static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
 
 	I915_WRITE(POWERGATE_ENABLE,
 		   I915_READ(POWERGATE_ENABLE) | vd_pg_enable);
+
+	/* Wa_1409825376:tgl (pre-prod)*/
+	if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0))
+		I915_WRITE(GEN9_CLKGATE_DIS_3, I915_READ(GEN9_CLKGATE_DIS_3) |
+			   TGL_VRH_GATING_DIS);
 }
 
 static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)
Signature · 6 lines
2.20.1

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

Workaround database indicates we should disable VRH clockgating in pre-production hardware.

Maybe also add a

    Bspec: 52890
    Bspec: 49424

for reference?

Quoted 13 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 3 +++
 drivers/gpu/drm/i915/intel_pm.c | 5 +++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 6cc55c103f67..5215df17e7bd 100644

drivers/gpu/drm/i915/i915_reg.h enum { · line 4128

Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4124,6 +4124,9 @@ enum {
 #define   PWM2_GATING_DIS		(1 << 14)
 #define   PWM1_GATING_DIS		(1 << 13)
 
+#define GEN9_CLKGATE_DIS_3		_MMIO(0x46538)
+#define   TGL_VRH_GATING_DIS		(1 << 31)

For new registers (or registers which are receiving noticeable updates), I think we're trying to slowly transition over to REG_BIT(31) notation.

Aside from that,

Quoted 23 lines
drivers/gpu/drm/i915/i915_reg.h +1 -0
+
 #define GEN9_CLKGATE_DIS_4		_MMIO(0x4653C)
 #define   BXT_GMBUS_GATING_DIS		(1 << 14)
 
drivers/gpu/drm/i915/intel_pm.c +5 -0
index 148ac455dfa7..0d71fc19d0ee 100644
@@ -6630,6 +6630,11 @@ static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
 
 	I915_WRITE(POWERGATE_ENABLE,
 		   I915_READ(POWERGATE_ENABLE) | vd_pg_enable);
+
+	/* Wa_1409825376:tgl (pre-prod)*/
+	if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0))
+		I915_WRITE(GEN9_CLKGATE_DIS_3, I915_READ(GEN9_CLKGATE_DIS_3) |
+			   TGL_VRH_GATING_DIS);
 }
 
 static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)
Signature · 1 line
2.20.1
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 13 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Thursday, January 9, 2020 2:12 PM
To: Sripada, Radhakrishna <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/i915/tgl: Add Wa_1409825376 to tgl

Quoted 2 lines · Radhakrishna Sripada

Workaround database indicates we should disable VRH clockgating in pre-production hardware.

Quoted 6 lines

Maybe also add a

    Bspec: 52890
    Bspec: 49424

for reference?

Sure will add in the next rev.

Quoted 24 lines
Quoted 15 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 3 +++
drivers/gpu/drm/i915/intel_pm.c | 5 +++++
 2 files changed, 8 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_reg.h index 6cc55c103f67..5215df17e7bd 100644

drivers/gpu/drm/i915/i915_reg.h enum { · line 4128

Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4124,6 +4124,9 @@ enum {
 #define   PWM2_GATING_DIS		(1 << 14)
 #define   PWM1_GATING_DIS		(1 << 13)
 
+#define GEN9_CLKGATE_DIS_3		_MMIO(0x46538)
+#define   TGL_VRH_GATING_DIS		(1 << 31)

For new registers (or registers which are receiving noticeable updates), I think we're trying to slowly transition over to REG_BIT(31) notation.

Quoted 3 lines

Aside from that,

Will use the newer notation.
Thanks for the review.

-Radhakrishna(RK) Sripada

Quoted 23 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_reg.h +1 -0
+
 #define GEN9_CLKGATE_DIS_4		_MMIO(0x4653C)
 #define   BXT_GMBUS_GATING_DIS		(1 << 14)
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_pm.c index 148ac455dfa7..0d71fc19d0ee 100644

drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct · line 6637

Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -6630,6 +6630,11 @@ static void tgl_init_clock_gating(struct
 drm_i915_private *dev_priv)
 
 	I915_WRITE(POWERGATE_ENABLE,
 		   I915_READ(POWERGATE_ENABLE) | vd_pg_enable);
+
+	/* Wa_1409825376:tgl (pre-prod)*/
+	if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0))
+		I915_WRITE(GEN9_CLKGATE_DIS_3,

I915_READ(GEN9_CLKGATE_DIS_3) |

Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +1 -0
+			   TGL_VRH_GATING_DIS);
 }
 
Quoted 11 lines
Quoted 4 lines

static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)
--
2.20.1

--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795

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