Skip to contentSkip to conversation

Wa_1604555607 implementation and verification skip

PATCH In review Ramalingam C 5 participants 10 messages Nov 21, 2019 – Nov 22, 2019

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

cover Wa_1604555607 implementation and verification skip

Implements the Wa_1604555607 and skips its verification as the FF_MODE2 register is write only till TGL B0.

Michel Thierry (1):
drm/i915/tgl: Implement Wa_1604555607

 drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  4 ++++
 2 files changed, 26 insertions(+), 3 deletions(-)
Signature · 6 lines
2.20.1

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

PATCH 1/1 drm/i915/tgl: Implement Wa_1604555607

From: Michel Thierry <[email protected]>

Implement Wa_1604555607 (set the DS pairing timer to 128 cycles). FF_MODE2 is part of the register state context, that's why it is implemented here.

At TGL A0 stepping, FF_MODE2 register read back is broken, hence disabling the WA verification.

v2: Rebased on top of the WA refactoring (Oscar)
v3: Correctly add to ctx_workarounds_init (Michel) v4:
uncore read is used [Tvrtko]
Macros as used for MASK definition [Chris]
v5:
Skip the Wa_1604555607 verification [Ram] i915 ptr retrieved from engine. [Tvrtko]

BSpec: 19363
HSDES: 1604555607

---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  4 ++++
 2 files changed, 26 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +22 -3
index 399acae2f33f..7cfd2442b736 100644
@@ -147,19 +147,26 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 }
 
 static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
-		   u32 val)
+__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		     u32 val, u32 read_mask)
 {
 	struct i915_wa wa = {
 		.reg  = reg,
 		.mask = mask,
 		.val  = val,
-		.read = mask,
+		.read = read_mask,
 	};
 
 	_wa_add(wal, &wa);
 }
 
+static void
+wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		   u32 val)
+{
+	__wa_write_masked_or(wal, reg, mask, val, mask);
+}
+
 static void
 wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 {
@@ -568,9 +575,21 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
 				     struct i915_wa_list *wal)
 {
+	u32 val;
+
 	/* Wa_1409142259:tgl */
 	WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
 			  GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);
+
+	/* Wa_1604555607:tgl */
+	val = intel_uncore_read(engine->uncore, FF_MODE2);
+	val &= ~FF_MODE2_TDS_TIMER_MASK;
+	val |= FF_MODE2_TDS_TIMER_128;
+	if (IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0))
+		__wa_write_masked_or(wal, FF_MODE2,
+				     FF_MODE2_TDS_TIMER_MASK, val, 0);
+	else
+		wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val);
 }
 
 static void
drivers/gpu/drm/i915/i915_reg.h +4 -0
index 94d0f593eeb7..a99fdf8ea53b 100644
@@ -7922,6 +7922,10 @@ enum {
 #define   PIXEL_ROUNDING_TRUNC_FB_PASSTHRU 	(1 << 15)
 #define   PER_PIXEL_ALPHA_BYPASS_EN		(1 << 7)
 
+#define FF_MODE2			_MMIO(0x6604)
+#define   FF_MODE2_TDS_TIMER_MASK	REG_GENMASK(23, 16)
+#define   FF_MODE2_TDS_TIMER_128	REG_FIELD_PREP(FF_MODE2_TDS_TIMER_MASK, 4)
+
 /* PCH */
 
 #define PCH_DISPLAY_BASE	0xc0000u
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
#2 lore raw

Re: [PATCH 1/1] drm/i915/tgl: Implement Wa_1604555607

Quoted 70 lines · Ramalingam C

From: Michel Thierry <[email protected]>

Implement Wa_1604555607 (set the DS pairing timer to 128 cycles). FF_MODE2 is part of the register state context, that's why it is implemented here.

At TGL A0 stepping, FF_MODE2 register read back is broken, hence disabling the WA verification.

v2: Rebased on top of the WA refactoring (Oscar)
v3: Correctly add to ctx_workarounds_init (Michel) v4:
uncore read is used [Tvrtko]
Macros as used for MASK definition [Chris]
v5:
Skip the Wa_1604555607 verification [Ram] i915 ptr retrieved from engine. [Tvrtko]

BSpec: 19363
HSDES: 1604555607

---
  drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++---
  drivers/gpu/drm/i915/i915_reg.h             |  4 ++++
  2 files changed, 26 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +12 -3
index 399acae2f33f..7cfd2442b736 100644
@@ -147,19 +147,26 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
  }
 
  static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
-		   u32 val)
+__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		     u32 val, u32 read_mask)
  {
  	struct i915_wa wa = {
  		.reg  = reg,
  		.mask = mask,
  		.val  = val,
-		.read = mask,
+		.read = read_mask,
  	};
 
  	_wa_add(wal, &wa);
  }
 
+static void
+wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		   u32 val)
+{
+	__wa_write_masked_or(wal, reg, mask, val, mask);
+}
+
  static void
  wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
  {
@@ -568,9 +575,21 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
  static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
  				     struct i915_wa_list *wal)
  {
+	u32 val;
+
  	/* Wa_1409142259:tgl */
  	WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
  			  GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);

drivers/gpu/drm/i915/gt/intel_workarounds.c static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, · line 592

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +10 -0
+
+	/* Wa_1604555607:tgl */
+	val = intel_uncore_read(engine->uncore, FF_MODE2);
+	val &= ~FF_MODE2_TDS_TIMER_MASK;
+	val |= FF_MODE2_TDS_TIMER_128;
+	if (IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0))
+		__wa_write_masked_or(wal, FF_MODE2,
+				     FF_MODE2_TDS_TIMER_MASK, val, 0);
+	else
+		wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val);

Hm a hybrid solution. I was thinking:

__wa_write_masked_or(wal,

		       FF_MODE2,
		       FF_MODE2_TDS_TIMER_MASK,
		       val,
		       IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0) ?
		       0 : FF_MODE2_TDS_TIMER_MASK);

But yours works as well.

Regards,

Tvrtko

Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +0 -0
  }
 
  static void
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 94d0f593eeb7..a99fdf8ea53b 100644

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

Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7922,6 +7922,10 @@ enum {
  #define   PIXEL_ROUNDING_TRUNC_FB_PASSTHRU 	(1 << 15)
  #define   PER_PIXEL_ALPHA_BYPASS_EN		(1 << 7)
 
+#define FF_MODE2			_MMIO(0x6604)
+#define   FF_MODE2_TDS_TIMER_MASK	REG_GENMASK(23, 16)
+#define   FF_MODE2_TDS_TIMER_128	REG_FIELD_PREP(FF_MODE2_TDS_TIMER_MASK, 4)
+
  /* PCH */
 
  #define PCH_DISPLAY_BASE	0xc0000u

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

#3 lore raw

Re: [PATCH 1/1] drm/i915/tgl: Implement Wa_1604555607

In reply to Ramalingam C

Quoting Ramalingam C (2019-11-21 10:12:26)

Quoted 39 lines

From: Michel Thierry <[email protected]>

Implement Wa_1604555607 (set the DS pairing timer to 128 cycles). FF_MODE2 is part of the register state context, that's why it is implemented here.

At TGL A0 stepping, FF_MODE2 register read back is broken, hence disabling the WA verification.

v2: Rebased on top of the WA refactoring (Oscar)
v3: Correctly add to ctx_workarounds_init (Michel) v4:
uncore read is used [Tvrtko]
Macros as used for MASK definition [Chris]
v5:
Skip the Wa_1604555607 verification [Ram] i915 ptr retrieved from engine. [Tvrtko]

BSpec: 19363
HSDES: 1604555607

---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  4 ++++
 2 files changed, 26 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -2
index 399acae2f33f..7cfd2442b736 100644
@@ -147,19 +147,26 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 }
 
 static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
-                  u32 val)
+__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+                    u32 val, u32 read_mask)

drivers/gpu/drm/i915/gt/intel_workarounds.c static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa) · line 160

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
 {
        struct i915_wa wa = {
                .reg  = reg,
                .mask = mask,
                .val  = val,
-               .read = mask,
+               .read = read_mask,
        };
 
        _wa_add(wal, &wa);

You might as well call it wa_add() since it takes all the arguments to _wa_add() and wraps them up into struct that we then copy.

Quoted 21 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +9 -0
 }
 
+static void
+wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+                  u32 val)
+{
+       __wa_write_masked_or(wal, reg, mask, val, mask);
+}
+
 static void
 wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 {
@@ -568,9 +575,21 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
                                     struct i915_wa_list *wal)
 {
+       u32 val;
+
        /* Wa_1409142259:tgl */
        WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
                          GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);

drivers/gpu/drm/i915/gt/intel_workarounds.c static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, · line 592

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +10 -0
+
+       /* Wa_1604555607:tgl */
+       val = intel_uncore_read(engine->uncore, FF_MODE2);
+       val &= ~FF_MODE2_TDS_TIMER_MASK;
+       val |= FF_MODE2_TDS_TIMER_128;
+       if (IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0))
+               __wa_write_masked_or(wal, FF_MODE2,
+                                    FF_MODE2_TDS_TIMER_MASK, val, 0);
+       else
+               wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val);

I still have this plan to do this as MI_MATH ops... But it's not a blocker.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH 1/1] drm/i915/tgl: Implement Wa_1604555607

Quoted 49 lines · Chris Wilson

Quoting Ramalingam C (2019-11-21 10:12:26)

Quoted 48 lines

From: Michel Thierry <[email protected]>

Implement Wa_1604555607 (set the DS pairing timer to 128 cycles). FF_MODE2 is part of the register state context, that's why it is implemented here.

At TGL A0 stepping, FF_MODE2 register read back is broken, hence disabling the WA verification.

v2: Rebased on top of the WA refactoring (Oscar)
v3: Correctly add to ctx_workarounds_init (Michel) v4:
uncore read is used [Tvrtko]
Macros as used for MASK definition [Chris]
v5:
Skip the Wa_1604555607 verification [Ram] i915 ptr retrieved from engine. [Tvrtko]

BSpec: 19363
HSDES: 1604555607

---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  4 ++++
 2 files changed, 26 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +3 -3
index 399acae2f33f..7cfd2442b736 100644
@@ -147,19 +147,26 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 }
 
 static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
-                  u32 val)
+__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+                    u32 val, u32 read_mask)
 {
        struct i915_wa wa = {
                .reg  = reg,
                .mask = mask,
                .val  = val,
-               .read = mask,
+               .read = read_mask,
        };
 
Quoted 5 lines

drivers/gpu/drm/i915/gt/intel_workarounds.c static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa) · line 160

Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +0 -0
        _wa_add(wal, &wa);

You might as well call it wa_add() since it takes all the arguments to _wa_add() and wraps them up into struct that we then copy.

Something like this?

static void wa_add(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,

                   u32 val, u32 read_mask)

{
struct i915_wa wa = {
.reg = reg,
.mask = mask,
.val = val,
.read = read_mask,
};

_wa_add(wal, &wa);
}

static void
__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,

                     u32 val, u32 read_mask)
{
        wa_add(wal, reg, mask, val, read_mask);
}

-Ram

Quoted 27 lines
Quoted 27 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +15 -0
 }
 
+static void
+wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+                  u32 val)
+{
+       __wa_write_masked_or(wal, reg, mask, val, mask);
+}
+
 static void
 wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 {
@@ -568,9 +575,21 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
                                     struct i915_wa_list *wal)
 {
+       u32 val;
+
        /* Wa_1409142259:tgl */
        WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
                          GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);
+
+       /* Wa_1604555607:tgl */
+       val = intel_uncore_read(engine->uncore, FF_MODE2);
+       val &= ~FF_MODE2_TDS_TIMER_MASK;
+       val |= FF_MODE2_TDS_TIMER_128;
+       if (IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0))
Quoted 8 lines

drivers/gpu/drm/i915/gt/intel_workarounds.c static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, · line 592

Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +4 -0
+               __wa_write_masked_or(wal, FF_MODE2,
+                                    FF_MODE2_TDS_TIMER_MASK, val, 0);
+       else
+               wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val);

I still have this plan to do this as MI_MATH ops... But it's not a blocker.
-Chris

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

#5 lore raw

PATCH 1/1 drm/i915/tgl: Implement Wa_1604555607

In reply to Ramalingam C

From: Michel Thierry <[email protected]>

Implement Wa_1604555607 (set the DS pairing timer to 128 cycles). FF_MODE2 is part of the register state context, that's why it is implemented here.

At TGL A0 stepping, FF_MODE2 register read back is broken, hence disabling the WA verification.

v2: Rebased on top of the WA refactoring (Oscar)
v3: Correctly add to ctx_workarounds_init (Michel) v4:
uncore read is used [Tvrtko]
Macros as used for MASK definition [Chris]
v5:
Skip the Wa_1604555607 verification [Ram]
i915 ptr retrieved from engine. [Tvrtko]
v6:
__wa_write_masked_or used with varying parameter [Tvrtko] Added wa_add as a wrapper for __wa_add [Chris]

BSpec: 19363
HSDES: 1604555607

---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 31 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  4 +++
 2 files changed, 31 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +27 -4
index 399acae2f33f..efb43eb99e22 100644
@@ -146,20 +146,33 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 	}
 }
 
-static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
-		   u32 val)
+static void wa_add(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		   u32 val, u32 read_mask)
 {
 	struct i915_wa wa = {
 		.reg  = reg,
 		.mask = mask,
 		.val  = val,
-		.read = mask,
+		.read = read_mask,
 	};
 
 	_wa_add(wal, &wa);
 }
 
+static void
+__wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		     u32 val, u32 read_mask)
+{
+	wa_add(wal, reg, mask, val, read_mask);
+}
+
+static void
+wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
+		   u32 val)
+{
+	__wa_write_masked_or(wal, reg, mask, val, mask);
+}
+
 static void
 wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
 {
@@ -568,9 +581,19 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
 static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
 				     struct i915_wa_list *wal)
 {
+	u32 val;
+
 	/* Wa_1409142259:tgl */
 	WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
 			  GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);
+
+	/* Wa_1604555607:tgl */
+	val = intel_uncore_read(engine->uncore, FF_MODE2);
+	val &= ~FF_MODE2_TDS_TIMER_MASK;
+	val |= FF_MODE2_TDS_TIMER_128;
+	__wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val,
+			     IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0) ? 0:
+			     FF_MODE2_TDS_TIMER_MASK);
 }
 
 static void
drivers/gpu/drm/i915/i915_reg.h +4 -0
index 94d0f593eeb7..a99fdf8ea53b 100644
@@ -7922,6 +7922,10 @@ enum {
 #define   PIXEL_ROUNDING_TRUNC_FB_PASSTHRU 	(1 << 15)
 #define   PER_PIXEL_ALPHA_BYPASS_EN		(1 << 7)
 
+#define FF_MODE2			_MMIO(0x6604)
+#define   FF_MODE2_TDS_TIMER_MASK	REG_GENMASK(23, 16)
+#define   FF_MODE2_TDS_TIMER_128	REG_FIELD_PREP(FF_MODE2_TDS_TIMER_MASK, 4)
+
 /* PCH */
 
 #define PCH_DISPLAY_BASE	0xc0000u
Signature · 6 lines
2.20.1

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

Re: [PATCH 1/1] drm/i915/tgl: Implement Wa_1604555607

drivers/gpu/drm/i915/gt/intel_workarounds.c static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, · line 595

Quoted 6 lines · Ramalingam C
drivers/gpu/drm/i915/gt/intel_workarounds.c +6 -0
+	/* Wa_1604555607:tgl */
+	val = intel_uncore_read(engine->uncore, FF_MODE2);
+	val &= ~FF_MODE2_TDS_TIMER_MASK;
+	val |= FF_MODE2_TDS_TIMER_128;
+	__wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val,
+			     IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0) ? 0:

isn't it broken until B0 rather than only on A0? I think we could just disable the read back for all revs and then selectively enable it for later.

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

#7 lore raw

Re: [PATCH 1/1] drm/i915/tgl: Implement Wa_1604555607

Quoted 11 lines · Lucas De Marchi

drivers/gpu/drm/i915/gt/intel_workarounds.c static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, · line 595

Quoted 6 lines · Ramalingam C
drivers/gpu/drm/i915/gt/intel_workarounds.c +6 -0
+	/* Wa_1604555607:tgl */
+	val = intel_uncore_read(engine->uncore, FF_MODE2);
+	val &= ~FF_MODE2_TDS_TIMER_MASK;
+	val |= FF_MODE2_TDS_TIMER_128;
+	__wa_write_masked_or(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val,
+			     IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0) ? 0:

isn't it broken until B0 rather than only on A0? I think we could just disable the read back for all revs and then selectively enable it for later.

Thought of excluding the verification when the new stepping comes in. Hence excluded for existing stepping alone.

Even your suggestion sounds good to me. I will go with it. With a FIXME Note to indicate that we need to enable for capable steppings.

-Ram

Quoted 2 lines

Lucas De Marchi

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

#8 lore raw

✗ Fi.CI.CHECKPATCH: warning for Wa_1604555607 implementation and verification skip (rev5)

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: Wa_1604555607 implementation and verification skip (rev5)
URL : https://patchwork.freedesktop.org/series/69763/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
efed46cc8be6 drm/i915/tgl: Implement Wa_1604555607
-:88: ERROR:SPACING: spaces required around that ':' (ctx:VxE)
#88: FILE: drivers/gpu/drm/i915/gt/intel_workarounds.c:595:
+			     IS_TGL_REVID(engine->i915, 0, TGL_REVID_A0) ? 0:
 			                                                    ^

total: 1 errors, 0 warnings, 0 checks, 66 lines checked

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

#9 lore raw

✓ Fi.CI.BAT: success for Wa_1604555607 implementation and verification skip (rev5)

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: Wa_1604555607 implementation and verification skip (rev5)
URL : https://patchwork.freedesktop.org/series/69763/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7400 -> Patchwork_15374
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15374/index.html

Known issues
------------

Here are the changes found in Patchwork_15374 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_pm_rpm@module-reload:
- fi-skl-6700k2: [PASS][1] -> [INCOMPLETE][2] ([fdo#107807])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7400/fi-skl-6700k2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15374/fi-skl-6700k2/igt@[email protected]

* igt@kms_busy@basic-flip-pipe-a:
- fi-icl-u2: [PASS][3] -> [TIMEOUT][4] ([fdo#111800])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7400/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15374/fi-icl-u2/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@reload-no-display:
- fi-skl-lmem: [DMESG-WARN][5] ([fdo#112261]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7400/fi-skl-lmem/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15374/fi-skl-lmem/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#111045] / [fdo#111096]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7400/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15374/fi-kbl-7500u/igt@[email protected]

[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111800]: https://bugs.freedesktop.org/show_bug.cgi?id=111800
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261

Participating hosts (50 -> 44)
------------------------------

Additional (1): fi-tgl-u
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_7400 -> Patchwork_15374

CI-20190529: 20190529
CI_DRM_7400: 353c51b7f47ae247ea02b231dc173ba7cfdeb484 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5299: 65fed6a79adea14f7bef6d55530da47d7731d370 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15374: efed46cc8be6b82ed47fa62efed59708cb1f59a8 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

efed46cc8be6 drm/i915/tgl: Implement Wa_1604555607

== Logs ==

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