Minor revid/stepping and workaround cleanup
Subsystems (3)
cover Minor revid/stepping and workaround cleanup
PCI revision IDs don't always map to GT and display IP steppings in an intuitive/sensible way. On many of our recent platforms we've switched to using revid->stepping lookup tables with the infrastructure in intel_step.c to handle stepping lookups and comparisons. Since it's confusing to have some of our platforms using the new lookup tables and some still using old revid comparisons, let's migrate all the old platforms over to the table approach since that's what we want to standardize on going forward. The only place that revision ID's should really get used directly now is when checking to see if we're running on pre-production hardware.
Let's also take the opportunity to drop a bit of effectively dead code in the workarounds file too.
Matt Roper (7):
drm/i915: Make pre-production detection use direct revid comparison drm/i915/skl: Use revid->stepping tables
drm/i915/icl: Use revid->stepping tables drm/i915/jsl_ehl: Use revid->stepping tables drm/i915/rkl: Use revid->stepping tables
drm/i915/dg1: Use revid->stepping tables
drm/i915/cnl: Drop all workarounds
.../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 81 +++---------------- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 80 +++--------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 72 +++++++++++++++-- drivers/gpu/drm/i915/intel_step.h | 7 ++ 10 files changed, 107 insertions(+), 153 deletions(-)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/7 drm/i915: Make pre-production detection use direct revid comparison
Although we're converting our workarounds to use a revid->stepping lookup table, the function that detects pre-production hardware should continue to compare against PCI revision ID values directly. These are listed in the bspec as integers, so it's easier to confirm their correctness if we just use an integer literal rather than a symbolic name anyway.
Since the BXT, GLK, and CNL revid macros were never used in any workaround code, just remove them completely.
Bspec: 13620, 19131, 13626, 18329
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 24 ------------------------ drivers/gpu/drm/i915/intel_step.h | 1 + 3 files changed, 5 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -271,10 +271,10 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)bool pre = false; pre |=IS_HSW_EARLY_SDV (dev_priv); - pre |=IS_SKL_REVID (dev_priv,0 ,SKL_REVID_F0 ); - pre |=IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B_LAST ); - pre |=IS_KBL_GT_STEP (dev_priv,0 ,STEP_A0 ); - pre |=IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A2 ); + pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; + pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; + pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; + pre |=IS_GEMINILAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x3 ;if (pre) { drm_err(&dev_priv->drm, "This is a pre-production stepping. "
drivers/gpu/drm/i915/i915_drv.h +0 -24
@@ -1473,35 +1473,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_SKL_REVID (p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until)) -#define BXT_REVID_A0 0x0 -#define BXT_REVID_A1 0x1 -#define BXT_REVID_B0 0x3 -#define BXT_REVID_B_LAST 0x8 -#define BXT_REVID_C0 0x9 - -#define IS_BXT_REVID (dev_priv, since, until) \ - (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until)) -#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define GLK_REVID_A0 0x0 -#define GLK_REVID_A1 0x1 -#define GLK_REVID_A2 0x2 -#define GLK_REVID_B0 0x3 - -#define IS_GLK_REVID (dev_priv, since, until) \ - (IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until)) - -#define CNL_REVID_A0 0x0 -#define CNL_REVID_B0 0x1 -#define CNL_REVID_C0 0x2 - -#define IS_CNL_REVID (p, since, until) \ - (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) -#define ICL_REVID_A0 0x0#define ICL_REVID_A2 0x1#define ICL_REVID_B0 0x3
drivers/gpu/drm/i915/intel_step.h +1 -0
@@ -22,6 +22,7 @@ struct intel_step_info {enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 ,STEP_B1 ,
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
Quoted 58 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Wednesday, July 7, 2021 10:38 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparisonAlthough we're converting our workarounds to use a
revid->steppinglookup table, the function that detects pre-production hardware should continue to compare against PCI revision ID values directly. These are listed in the bspec as integers, so it's easier to confirm their correctness if we just use an integer literal rather than a symbolic name anyway.Since the BXT, GLK, and CNL revid macros were never used in any workaround code, just remove them completely.
Bspec: 13620, 19131, 13626, 18329
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 24 ------------------------ drivers/gpu/drm/i915/intel_step.h | 1 + 3 files changed, 5 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex30d8cd8c69b1..90136995f5eb100644drivers/gpu/drm/i915/i915_drv.c +4
-4@@ -271,10 +271,10 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)bool pre = false; pre |=IS_HSW_EARLY_SDV (dev_priv); - pre |=IS_SKL_REVID (dev_priv,0 ,SKL_REVID_F0 ); - pre |=IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B_LAST ); - pre |=IS_KBL_GT_STEP (dev_priv,0 ,STEP_A0 ); - pre |=IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A2 ); + pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; + pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; + pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; + pre |=IS_GEMINILAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x3 ;if (pre) {drm_err(&dev_priv->drm, "This is a pre-production stepping.
"(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex6dff4ca01241..796e6838bc79100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1473,35 +1473,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_SKL_REVID (p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since,
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private · line 1485
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +0
-8until)) -#define BXT_REVID_A0 0x0 -#define BXT_REVID_A1 0x1 -#define BXT_REVID_B0 0x3 -#define BXT_REVID_B_LAST 0x8 -#define BXT_REVID_C0 0x9 - -#define IS_BXT_REVID (dev_priv, since, until) \ - (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))
Here, we can have IS_BXT_GT_STEP, similar to other platform and use in intel_detect_preproduction_hw() above. Same for other platforms - SKL and GLK. KBL already uses IS_KBL_GT_STEP.
Anusha
Quoted 39 lines
drivers/gpu/drm/i915/i915_drv.h +0
-15#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define GLK_REVID_A0 0x0 -#define GLK_REVID_A1 0x1 -#define GLK_REVID_A2 0x2 -#define GLK_REVID_B0 0x3 - -#define IS_GLK_REVID (dev_priv, since, until) \ - (IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until)) - -#define CNL_REVID_A0 0x0 -#define CNL_REVID_B0 0x1 -#define CNL_REVID_C0 0x2 - -#define IS_CNL_REVID (p, since, until) \ - (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) -#define ICL_REVID_A0 0x0#define ICL_REVID_A2 0x1#define ICL_REVID_B0 0x3drivers/gpu/drm/i915/intel_step.h +1
-1@@ -22,6 +22,7 @@ struct intel_step_info { enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 , STEP_B1, --2.25.4
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
Re: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
Quoted 60 lines · Anusha
Quoted 60 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Wednesday, July 7, 2021 10:38 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparisonAlthough we're converting our workarounds to use a
revid->steppinglookup table, the function that detects pre-production hardware should continue to compare against PCI revision ID values directly. These are listed in the bspec as integers, so it's easier to confirm their correctness if we just use an integer literal rather than a symbolic name anyway.Since the BXT, GLK, and CNL revid macros were never used in any workaround code, just remove them completely.
Bspec: 13620, 19131, 13626, 18329
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 24 ------------------------ drivers/gpu/drm/i915/intel_step.h | 1 + 3 files changed, 5 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex30d8cd8c69b1..90136995f5eb100644drivers/gpu/drm/i915/i915_drv.c +4
-4@@ -271,10 +271,10 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)bool pre = false; pre |=IS_HSW_EARLY_SDV (dev_priv); - pre |=IS_SKL_REVID (dev_priv,0 ,SKL_REVID_F0 ); - pre |=IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B_LAST ); - pre |=IS_KBL_GT_STEP (dev_priv,0 ,STEP_A0 ); - pre |=IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A2 ); + pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; + pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; + pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; + pre |=IS_GEMINILAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x3 ;if (pre) {drm_err(&dev_priv->drm, "This is a pre-production stepping.
"(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex6dff4ca01241..796e6838bc79100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1473,35 +1473,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 1483
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +0
-8-#define BXT_REVID_A0 0x0 -#define BXT_REVID_A1 0x1 -#define BXT_REVID_B0 0x3 -#define BXT_REVID_B_LAST 0x8 -#define BXT_REVID_C0 0x9 - -#define IS_BXT_REVID (dev_priv, since, until) \ - (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))Here, we can have
IS_BXT_GT_STEP, similar to other platform and use inintel_detect_preproduction_hw()above. Same for other platforms - SKL and GLK. KBL already usesIS_KBL_GT_STEP.
Are you going to use that macro in your DMC code? If not, there's no need for it since we don't have any stepping-specific workarounds on BXT that would use the macro. For now I've only kept the GT and/or display stepping macros on platforms that will actually use them (like KBL).
I just sent a v2 of the series that I think should be suitable for you to build your DMC work on top of (and I included one of the patches from your series at the beginning of mine). Note that I punted on adding tables for CFL/WHL/AML/CML because the steppings on those platforms are a bit weird and I'm not sure exactly what you'll need from the DMC side of things. We don't need the tables on those platforms for workarounds, so you can add them with your DMC series when you know exactly how you need the data presented.
Matt
Quoted 45 lines
Anusha
Quoted 43 lines
drivers/gpu/drm/i915/i915_drv.h +0
-15#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define GLK_REVID_A0 0x0 -#define GLK_REVID_A1 0x1 -#define GLK_REVID_A2 0x2 -#define GLK_REVID_B0 0x3 - -#define IS_GLK_REVID (dev_priv, since, until) \ - (IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until)) - -#define CNL_REVID_A0 0x0 -#define CNL_REVID_B0 0x1 -#define CNL_REVID_C0 0x2 - -#define IS_CNL_REVID (p, since, until) \ - (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) -#define ICL_REVID_A0 0x0#define ICL_REVID_A2 0x1#define ICL_REVID_B0 0x3drivers/gpu/drm/i915/intel_step.h +1
-1@@ -22,6 +22,7 @@ struct intel_step_info { enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 , STEP_B1, --2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
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
Srivatsa, Anusha
Reviewed-byRe: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
Quoted 21 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Friday, July 9, 2021 8:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Jani Nikula <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparisonQuoted 10 lines · Anusha
Quoted 10 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Wednesday, July 7, 2021 10:38 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
Quoted 12 lines
Quoted 5 lines
Quoted 5 lines
Although we're converting our workarounds to use a
revid->steppinglookup table, the function that detects pre-production hardware should continue to compare against PCI revision ID values directly. These are listed in the bspec as integers, so it's easier to confirm their correctness if we just use an integer literal rather than a symbolicname anyway.
Quoted 6 lines
Quoted 6 lines
Since the BXT, GLK, and CNL revid macros were never used in any workaround code, just remove them completely.
Bspec: 13620, 19131, 13626, 18329
Signed-off-by Matt Roper <[email protected]>
Quoted 113 lines
Quoted 26 lines
Quoted 26 lines
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 24 ------------------------ drivers/gpu/drm/i915/intel_step.h | 1 + 3 files changed, 5 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex30d8cd8c69b1..90136995f5eb100644drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -271,10 +271,10 @@ static voidintel_detect_preproduction_hw(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/i915_drv.c +4
-4bool pre = false; pre |=IS_HSW_EARLY_SDV (dev_priv); - pre |=IS_SKL_REVID (dev_priv,0 ,SKL_REVID_F0 ); - pre |=IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B_LAST ); - pre |=IS_KBL_GT_STEP (dev_priv,0 ,STEP_A0 ); - pre |=IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A2 ); + pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; + pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; + pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; + pre |=IS_GEMINILAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x3 ;Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +0
-0if (pre) { drm_err(&dev_priv->drm, "This is a pre-production stepping."
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex6dff4ca01241..796e6838bc79100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1473,35 +1473,11 @@ IS_SUBPLATFORM(const struct
drm_i915_privateQuoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0*i915, #define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 1483
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +0
-8-#define BXT_REVID_A0 0x0 -#define BXT_REVID_A1 0x1 -#define BXT_REVID_B0 0x3 -#define BXT_REVID_B_LAST 0x8 -#define BXT_REVID_C0 0x9 - -#define IS_BXT_REVID (dev_priv, since, until) \ - (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))Here, we can have
IS_BXT_GT_STEP, similar to other platform and use in
intel_detect_preproduction_hw()above.Quoted 1 line
Same for other platforms - SKL and GLK. KBL already uses
IS_KBL_GT_STEP.Are you going to use that macro in your DMC code? If not, there's no need for it since we don't have any stepping-specific workarounds on BXT that would use the macro. For now I've only kept the GT and/or display stepping macros on platforms that will actually use them (like KBL).
I just sent a v2 of the series that I think should be suitable for you to build your DMC work on top of (and I included one of the patches from your series at the beginning of mine). Note that I punted on adding tables for CFL/WHL/AML/CML because the steppings on those platforms are a bit weird and I'm not sure exactly what you'll need from the DMC side of things. We don't need the tables on those platforms for workarounds, so you can add them with your DMC series when you know exactly how you need the data presented.
Matt
Quoted 41 lines
Anusha
Quoted 39 lines
drivers/gpu/drm/i915/i915_drv.h +0
-15#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define GLK_REVID_A0 0x0 -#define GLK_REVID_A1 0x1 -#define GLK_REVID_A2 0x2 -#define GLK_REVID_B0 0x3 - -#define IS_GLK_REVID (dev_priv, since, until) \ - (IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until)) - -#define CNL_REVID_A0 0x0 -#define CNL_REVID_B0 0x1 -#define CNL_REVID_C0 0x2 - -#define IS_CNL_REVID (p, since, until) \ - (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) -#define ICL_REVID_A0 0x0#define ICL_REVID_A2 0x1#define ICL_REVID_B0 0x3drivers/gpu/drm/i915/intel_step.h +1
-1@@ -22,6 +22,7 @@ struct intel_step_info { enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 , STEP_B1, --2.25.4
Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
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
Srivatsa, Anusha
Reviewed-byRe: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
In reply to Matt RoperQuoted 21 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Friday, July 9, 2021 8:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Jani Nikula <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparisonQuoted 10 lines · Anusha
Quoted 10 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Wednesday, July 7, 2021 10:38 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH 1/7] drm/i915: Make pre-production detection use direct revid comparison
Quoted 12 lines
Quoted 5 lines
Quoted 5 lines
Although we're converting our workarounds to use a
revid->steppinglookup table, the function that detects pre-production hardware should continue to compare against PCI revision ID values directly. These are listed in the bspec as integers, so it's easier to confirm their correctness if we just use an integer literal rather than a symbolicname anyway.
Quoted 6 lines
Quoted 6 lines
Since the BXT, GLK, and CNL revid macros were never used in any workaround code, just remove them completely.
Bspec: 13620, 19131, 13626, 18329
Signed-off-by Matt Roper <[email protected]>
Quoted 113 lines
Quoted 26 lines
Quoted 26 lines
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 24 ------------------------ drivers/gpu/drm/i915/intel_step.h | 1 + 3 files changed, 5 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex30d8cd8c69b1..90136995f5eb100644drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -271,10 +271,10 @@ static voidintel_detect_preproduction_hw(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/i915_drv.c +4
-4bool pre = false; pre |=IS_HSW_EARLY_SDV (dev_priv); - pre |=IS_SKL_REVID (dev_priv,0 ,SKL_REVID_F0 ); - pre |=IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B_LAST ); - pre |=IS_KBL_GT_STEP (dev_priv,0 ,STEP_A0 ); - pre |=IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A2 ); + pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; + pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; + pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; + pre |=IS_GEMINILAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x3 ;Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +0
-0if (pre) { drm_err(&dev_priv->drm, "This is a pre-production stepping."
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex6dff4ca01241..796e6838bc79100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1473,35 +1473,11 @@ IS_SUBPLATFORM(const struct
drm_i915_privateQuoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0*i915, #define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 1483
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +0
-8-#define BXT_REVID_A0 0x0 -#define BXT_REVID_A1 0x1 -#define BXT_REVID_B0 0x3 -#define BXT_REVID_B_LAST 0x8 -#define BXT_REVID_C0 0x9 - -#define IS_BXT_REVID (dev_priv, since, until) \ - (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))Here, we can have
IS_BXT_GT_STEP, similar to other platform and use in
intel_detect_preproduction_hw()above.Quoted 1 line
Same for other platforms - SKL and GLK. KBL already uses
IS_KBL_GT_STEP.Are you going to use that macro in your DMC code? If not, there's no need for it since we don't have any stepping-specific workarounds on BXT that would use the macro. For now I've only kept the GT and/or display stepping macros on platforms that will actually use them (like KBL).
I just sent a v2 of the series that I think should be suitable for you to build your DMC work on top of (and I included one of the patches from your series at the beginning of mine). Note that I punted on adding tables for CFL/WHL/AML/CML because the steppings on those platforms are a bit weird and I'm not sure exactly what you'll need from the DMC side of things. We don't need the tables on those platforms for workarounds, so you can add them with your DMC series when you know exactly how you need the data presented.
Matt
Quoted 41 lines
Anusha
Quoted 39 lines
drivers/gpu/drm/i915/i915_drv.h +0
-15#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define GLK_REVID_A0 0x0 -#define GLK_REVID_A1 0x1 -#define GLK_REVID_A2 0x2 -#define GLK_REVID_B0 0x3 - -#define IS_GLK_REVID (dev_priv, since, until) \ - (IS_GEMINILAKE(dev_priv) && IS_REVID(dev_priv, since, until)) - -#define CNL_REVID_A0 0x0 -#define CNL_REVID_B0 0x1 -#define CNL_REVID_C0 0x2 - -#define IS_CNL_REVID (p, since, until) \ - (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) -#define ICL_REVID_A0 0x0#define ICL_REVID_A2 0x1#define ICL_REVID_B0 0x3drivers/gpu/drm/i915/intel_step.h +1
-1@@ -22,6 +22,7 @@ struct intel_step_info { enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 , STEP_B1, --2.25.4
Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
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
PATCH 2/7 drm/i915/skl: Use revid->stepping tables
In reply to Matt RoperSwitch SKL to use a revid->stepping table as we're trying to do on all platforms going forward. Also add some additional stepping definitions for completeness, even if we don't have any workarounds tied to them.
Note that SKL has a case where a newer revision ID corresponds to an older GT/disp stepping (0x9 -> STEP_J0, 0xA -> STEP_I1). Also, the lack of a revision ID 0x8 in the table is intentional and not an oversight. We'll re-write the KBL-specific comment to make it clear that these kind of quirks are expected.
Finally, since we're already touching the KBL area too, let's rename the KBL table to match the naming convention used by all of the other platforms.
Bspec: 13626
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 11 +------ drivers/gpu/drm/i915/intel_step.c | 35 ++++++++++++++++----- drivers/gpu/drm/i915/intel_step.h | 4 +++ 4 files changed, 33 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
@@ -883,7 +883,7 @@ skl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);/* WaInPlaceDecompressionHang:skl */ -if (IS_SKL_REVID (i915,SKL_REVID_H0 ,REVID_FOREVER )) +if (IS_SKL_GT_STEP (i915,STEP_H0 ,STEP_FOREVER ))wa_write_or (wal,GEN9_GAMT_ECO_REG_RW_IA ,GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS );
drivers/gpu/drm/i915/i915_drv.h +1 -10
@@ -1462,16 +1462,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_TGL_Y (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_ULX) -#define SKL_REVID_A0 0x0 -#define SKL_REVID_B0 0x1 -#define SKL_REVID_C0 0x2 -#define SKL_REVID_D0 0x3 -#define SKL_REVID_E0 0x4 -#define SKL_REVID_F0 0x5 -#define SKL_REVID_G0 0x6 -#define SKL_REVID_H0 0x7 - -#define IS_SKL_REVID (p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until)) +#define IS_SKL_GT_STEP (p, since, until) (IS_SKYLAKE(p) && IS_GT_STEP(p, since, until))#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until))
drivers/gpu/drm/i915/intel_step.c +27 -8
@@ -7,15 +7,31 @@#include "intel_step.h" /* -* KBL revision ID ordering is bizarre; higher revision ID's map to lower -* steppings in some cases. So rather than test against the revision ID -* directly, let's map that into our own range of increasing ID's that we -* can test against in a regular manner. +* Some platforms have unusual ways of mapping PCI revision ID to GT/display +* steppings. E.g., in some cases a higher PCI revision may translate to a +* lower stepping of the GT and/or display IP. This file provides lookup +* tables to map the PCI revision into a standard set of stepping values that +* can be compared numerically. +* +* Also note that some revisions/steppings may have been set aside as +* placeholders but never materialized in real hardware; in those cases there +* may be jumps in the revision IDs or stepping values in the tables below. */ +static const struct intel_step_info skl_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [0x1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, + [0x2 ] = { .gt_step =STEP_C0 , .display_step =STEP_C0 }, + [0x3 ] = { .gt_step =STEP_D0 , .display_step =STEP_D0 }, + [0x4 ] = { .gt_step =STEP_E0 , .display_step =STEP_E0 }, + [0x5 ] = { .gt_step =STEP_F0 , .display_step =STEP_F0 }, + [0x6 ] = { .gt_step =STEP_G0 , .display_step =STEP_G0 }, + [0x7 ] = { .gt_step =STEP_H0 , .display_step =STEP_H0 }, + [0x9 ] = { .gt_step =STEP_J0 , .display_step =STEP_J0 }, + [0xA ] = { .gt_step =STEP_I1 , .display_step =STEP_I1 }, +}; -/* FIXME: what about REVID_E0 */ -static const struct intel_step_info kbl_revids[] = { +static const struct intel_step_info kbl_revid_step_tbl[] = { [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, [2 ] = { .gt_step =STEP_C0 , .display_step =STEP_B0 },
@@ -74,8 +90,11 @@ void intel_step_init(struct drm_i915_private *i915) revids = tgl_revid_step_tbl; size =ARRAY_SIZE (tgl_revid_step_tbl); }else if (IS_KABYLAKE (i915)) { - revids = kbl_revids; - size =ARRAY_SIZE (kbl_revids); + revids = kbl_revid_step_tbl; + size =ARRAY_SIZE (kbl_revid_step_tbl); + }else if (IS_SKYLAKE (i915)) { + revids = skl_revid_step_tbl; + size =ARRAY_SIZE (skl_revid_step_tbl); }/* Not using the stepping scheme for the platform yet. */
drivers/gpu/drm/i915/intel_step.h +4 -0
@@ -32,6 +32,10 @@ enum intel_step {STEP_E0 ,STEP_F0 ,STEP_G0 , +STEP_H0 , +STEP_I0 , +STEP_I1 , +STEP_J0 ,STEP_FUTURE , STEP_FOREVER, };
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/7] drm/i915/skl: Use revid->stepping tables
Quoted 102 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Wednesday, July 7, 2021 10:38 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH 2/7] drm/i915/skl: Userevid->steppingtablesSwitch SKL to use a
revid->steppingtable as we're trying to do on all platforms going forward. Also add some additional stepping definitions for completeness, even if we don't have any workarounds tied to them.Note that SKL has a case where a newer revision ID corresponds to an older GT/disp stepping (
0x9->STEP_J0,0xA->STEP_I1). Also, the lack of a revision ID0x8in the table is intentional and not an oversight.
We'll re-write the KBL-specific comment to make it clear that these kind of quirks are expected.Finally, since we're already touching the KBL area too, let's rename the KBL table to match the naming convention used by all of the other platforms.
Bspec: 13626
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 11 +------ drivers/gpu/drm/i915/intel_step.c | 35 ++++++++++++++++----- drivers/gpu/drm/i915/intel_step.h | 4 +++ 4 files changed, 33 insertions(+), 19 deletions(-)drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -883,7 +883,7 @@ skl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);/* WaInPlaceDecompressionHang:skl */ -if (IS_SKL_REVID (i915,SKL_REVID_H0 ,REVID_FOREVER )) +if (IS_SKL_GT_STEP (i915,STEP_H0 ,STEP_FOREVER )) wa_write_or(wal, GEN9_GAMT_ECO_REG_RW_IA,drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex796e6838bc79..300575f64ca6100644drivers/gpu/drm/i915/i915_drv.h +2
-11@@ -1462,16 +1462,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define IS_TGL_Y(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_ULX) -#define SKL_REVID_A0 0x0 -#define SKL_REVID_B0 0x1 -#define SKL_REVID_C0 0x2 -#define SKL_REVID_D0 0x3 -#define SKL_REVID_E0 0x4 -#define SKL_REVID_F0 0x5 -#define SKL_REVID_G0 0x6 -#define SKL_REVID_H0 0x7 - -#define IS_SKL_REVID (p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until)) +#define IS_SKL_GT_STEP(p, since, until) (IS_SKYLAKE(p) && IS_GT_STEP(p, +since, until))#define IS_KBL_GT_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_GT_STEP(dev_priv, since, until)) diff - -git a/drivers/gpu/drm/i915/intel_step.c
b/drivers/gpu/drm/i915/intel_step.c
indexba9479a67521..bfd63f56c200100644drivers/gpu/drm/i915/intel_step.c +15
-4@@ -7,15 +7,31 @@#include "intel_step.h" /* -* KBL revision ID ordering is bizarre; higher revision ID's map to lower -* steppings in some cases. So rather than test against the revision ID -* directly, let's map that into our own range of increasing ID's that we -* can test against in a regular manner. +* Some platforms have unusual ways of mapping PCI revision ID to +GT/display +* steppings. E.g., in some cases a higher PCI revision may translate +to a +* lower stepping of the GT and/or display IP. This file provides +lookup +* tables to map the PCI revision into a standard set of stepping +values that +* can be compared numerically. +* +* Also note that some revisions/steppings may have been set aside as +* placeholders but never materialized in real hardware; in those cases +there +* may be jumps in the revision IDs or stepping values in the tables below. */ +static const struct intel_step_info skl_revid_step_tbl[] = {
drivers/gpu/drm/i915/intel_step.c line 36
Quoted 10 lines
drivers/gpu/drm/i915/intel_step.c +10
-0+ [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, + [0x1] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, + [0x2] = { .gt_step = STEP_C0, .display_step = STEP_C0 }, + [0x3] = { .gt_step = STEP_D0, .display_step = STEP_D0 }, + [0x4] = { .gt_step = STEP_E0, .display_step = STEP_E0 }, + [0x5] = { .gt_step = STEP_F0, .display_step = STEP_F0 }, + [0x6] = { .gt_step = STEP_G0, .display_step = STEP_G0 }, + [0x7] = { .gt_step = STEP_H0, .display_step = STEP_H0 }, + [0x9] = { .gt_step = STEP_J0, .display_step = STEP_J0 }, + [0xA] = { .gt_step = STEP_I1, .display_step = STEP_I1 }, };
Feedback I received was to avoid adding .display_step if it is same as .gt_step and have something like:
if (step.display_step == STEP_NONE)
+ step.display_step = step.gt_step;
In intel_step_init() below.
Anusha
Quoted 38 lines
drivers/gpu/drm/i915/intel_step.c +7
-4-/* FIXME: what about REVID_E0 */ -static const struct intel_step_info kbl_revids[] = { +static const struct intel_step_info kbl_revid_step_tbl[] = { [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, [2] = { .gt_step = STEP_C0, .display_step = STEP_B0 }, @@ -74,8 +90,11 @@ void intel_step_init(struct drm_i915_private *i915) revids = tgl_revid_step_tbl; size = ARRAY_SIZE(tgl_revid_step_tbl); } else if (IS_KABYLAKE(i915)) { - revids = kbl_revids; - size =ARRAY_SIZE (kbl_revids); + revids = kbl_revid_step_tbl; + size =ARRAY_SIZE (kbl_revid_step_tbl); + } else if (IS_SKYLAKE(i915)) { + revids = skl_revid_step_tbl; + size =ARRAY_SIZE (skl_revid_step_tbl); } /* Not using the stepping scheme for the platform yet. */ diff --git
a/drivers/gpu/drm/i915/intel_step.hb/drivers/gpu/drm/i915/intel_step.hindex8efacef6ab31..41567d9b7c35100644drivers/gpu/drm/i915/intel_step.h +4
-1@@ -32,6 +32,10 @@ enum intel_step {STEP_E0 ,STEP_F0 ,STEP_G0 , +STEP_H0 , +STEP_I0 , +STEP_I1 , +STEP_J0 ,STEP_FUTURE , STEP_FOREVER, }; --2.25.4
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
PATCH 3/7 drm/i915/icl: Use revid->stepping tables
In reply to Matt RoperSwitch ICL to use a revid->stepping table as we're trying to do on all platforms going forward. While we're at it, let's include some additional steppings that have popped up, even if we don't yet have any workarounds tied to those steppings (we probably need to audit our workaround list soon to see if any of the bounds have moved or if new workarounds have appeared).
Note that the current bspec table is missing information about how to map PCI revision ID to GT/display steppings; it only provides an SoC stepping. The mapping to GT/display steppings (which aren't always the same as the SoC stepping) used to be in the bspec, but was apparently dropped during an update in Nov 2019; I've made my changes here based on an older bspec snapshot that still had the necessary information. We've requested that the missing information be restored.
Bspec: 21441 # pre-Nov 2019 snapshot
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 ++++++------ drivers/gpu/drm/i915/i915_drv.h | 10 ++-------- drivers/gpu/drm/i915/intel_step.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_step.h | 2 ++ 4 files changed, 22 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +6 -6
@@ -557,7 +557,7 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,/* Wa_1604370585:icl (pre-prod) * Formerly known as WaPushConstantDereferenceHoldDisable */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_B0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_B0 ))wa_masked_en (wal,GEN7_ROW_CHICKEN2 ,PUSH_CONSTANT_DEREF_DISABLE );
@@ -573,12 +573,12 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,/* Wa_2006611047:icl (pre-prod) * Formerly known as WaDisableImprovedTdlClkGating */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_A0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_A0 ))wa_masked_en (wal,GEN7_ROW_CHICKEN2 ,GEN11_TDL_CLOCK_GATING_FIX_DISABLE );/* Wa_2006665173:icl (pre-prod) */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_A0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_A0 ))wa_masked_en (wal,GEN11_COMMON_SLICE_CHICKEN3 ,GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC );
@@ -1023,13 +1023,13 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) GAMW_ECO_DEV_CTX_RELOAD_DISABLE);/* Wa_1405779004:icl (pre-prod) */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_A0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE ,MSCUNIT_CLKGATE_DIS );/* Wa_1406838659:icl (pre-prod) */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_B0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_B0 ))wa_write_or (wal,INF_UNIT_LEVEL_CLKGATE ,CGPSF_CLKGATE_DIS );
@@ -1725,7 +1725,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) PMFLUSHDONE_LNEBLK);/* Wa_1406609255:icl (pre-prod) */ -if (IS_ICL_REVID (i915,ICL_REVID_A0 ,ICL_REVID_B0 )) +if (IS_ICL_GT_STEP (i915,STEP_A0 ,STEP_B0 ))wa_write_or (wal,GEN7_SARCHKMD ,GEN7_DISABLE_DEMAND_PREFETCH );
drivers/gpu/drm/i915/i915_drv.h +2 -8
@@ -1469,14 +1469,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_KBL_DISPLAY_STEP (dev_priv, since, until) \ (IS_KABYLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, since, until)) -#define ICL_REVID_A0 0x0 -#define ICL_REVID_A2 0x1 -#define ICL_REVID_B0 0x3 -#define ICL_REVID_B2 0x4 -#define ICL_REVID_C0 0x5 - -#define IS_ICL_REVID (p, since, until) \ - (IS_ICELAKE(p) && IS_REVID(p, since, until)) +#define IS_ICL_GT_STEP (p, since, until) \ + (IS_ICELAKE(p) && IS_GT_STEP(p, since, until))#define EHL_REVID_A0 0x0#define EHL_REVID_B0 0x1
drivers/gpu/drm/i915/intel_step.c +12 -0
@@ -42,6 +42,15 @@ static const struct intel_step_info kbl_revid_step_tbl[] = { [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, }; +static const struct intel_step_info icl_revid_step_tbl[] = { + [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [3 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, + [4 ] = { .gt_step =STEP_B2 , .display_step =STEP_B2 }, + [5 ] = { .gt_step =STEP_C0 , .display_step =STEP_C0 }, + [6 ] = { .gt_step =STEP_C1 , .display_step =STEP_C1 }, + [7 ] = { .gt_step =STEP_D0 , .display_step =STEP_D0 }, +}; +static const struct intel_step_info tgl_uy_revid_step_tbl[] = { [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_C0 },
@@ -89,6 +98,9 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_TIGERLAKE (i915)) { revids = tgl_revid_step_tbl; size =ARRAY_SIZE (tgl_revid_step_tbl); + }else if (IS_ICELAKE (i915)) { + revids = icl_revid_step_tbl; + size =ARRAY_SIZE (icl_revid_step_tbl); }else if (IS_KABYLAKE (i915)) { revids = kbl_revid_step_tbl; size =ARRAY_SIZE (kbl_revid_step_tbl);
drivers/gpu/drm/i915/intel_step.h +2 -0
@@ -26,7 +26,9 @@ enum intel_step {STEP_A2 ,STEP_B0 ,STEP_B1 , +STEP_B2 ,STEP_C0 , +STEP_C1 ,STEP_D0 ,STEP_D1 , STEP_E0,
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/7 drm/i915/jsl_ehl: Use revid->stepping tables
In reply to Matt RoperSwitch JSL/EHL to use a revid->stepping table as we're trying to do on all platforms going forward.
Bspec: 29153
--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 9 ++++----- drivers/gpu/drm/i915/intel_step.c | 8 ++++++++ 4 files changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -2674,7 +2674,7 @@ static bool ehl_combo_pll_div_frac_wa_needed(struct drm_i915_private *i915) {return ((IS_PLATFORM (i915,INTEL_ELKHARTLAKE ) && -IS_JSL_EHL_REVID (i915,EHL_REVID_B0 ,REVID_FOREVER )) || +IS_JSL_EHL_DISPLAY_STEP (i915,STEP_B0 ,STEP_FOREVER )) ||IS_TIGERLAKE (i915) ||IS_ALDERLAKE_P (i915)) && i915->dpll.ref_clks.nssc ==38400 ; }
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
@@ -1043,7 +1043,7 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)/* Wa_1607087056:icl,ehl,jsl */ if (IS_ICELAKE (i915) || -IS_JSL_EHL_REVID (i915,EHL_REVID_A0 ,EHL_REVID_A0 )) +IS_JSL_EHL_GT_STEP (i915,STEP_A0 ,STEP_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE ,L3_CLKGATE_DIS |L3_CR2X_CLKGATE_DIS );
drivers/gpu/drm/i915/i915_drv.h +4 -5
@@ -1472,11 +1472,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ICL_GT_STEP (p, since, until) \ (IS_ICELAKE(p) && IS_GT_STEP(p, since, until)) -#define EHL_REVID_A0 0x0 -#define EHL_REVID_B0 0x1 - -#define IS_JSL_EHL_REVID (p, since, until) \ - (IS_JSL_EHL(p) && IS_REVID(p, since, until)) +#define IS_JSL_EHL_GT_STEP (p, since, until) \ + (IS_JSL_EHL(p) && IS_GT_STEP(p, since, until)) +#define IS_JSL_EHL_DISPLAY_STEP (p, since, until) \ + (IS_JSL_EHL(p) && IS_DISPLAY_STEP(p, since, until))#define IS_TGL_DISPLAY_STEP (__i915, since, until) \ (IS_TIGERLAKE(__i915) && \
drivers/gpu/drm/i915/intel_step.c +8 -0
@@ -51,6 +51,11 @@ static const struct intel_step_info icl_revid_step_tbl[] = { [7] = { .gt_step = STEP_D0, .display_step = STEP_D0 }, }; +static const struct intel_step_info jsl_ehl_revid_step_tbl[] = { + [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, +}; +static const struct intel_step_info tgl_uy_revid_step_tbl[] = { [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_C0 },
@@ -98,6 +103,9 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_TIGERLAKE (i915)) { revids = tgl_revid_step_tbl; size =ARRAY_SIZE (tgl_revid_step_tbl); + }else if (IS_JSL_EHL (i915)) { + revids = jsl_ehl_revid_step_tbl; + size =ARRAY_SIZE (jsl_ehl_revid_step_tbl); }else if (IS_ICELAKE (i915)) { revids = icl_revid_step_tbl; size =ARRAY_SIZE (icl_revid_step_tbl);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/7 drm/i915/rkl: Use revid->stepping tables
In reply to Matt RoperSwitch RKL to use a revid->stepping table as we're trying to do on all platforms going forward.
Bspec: 44501
--- drivers/gpu/drm/i915/display/intel_psr.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++------ drivers/gpu/drm/i915/intel_step.c | 9 +++++++++ 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +2 -2
@@ -594,7 +594,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (intel_dp->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ if (IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_A0 ) || -IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )) +IS_RKL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_A0 ))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 ,DIS_RAM_BYPASS_PSR2_MAN_TRACK ,DIS_RAM_BYPASS_PSR2_MAN_TRACK );
@@ -1342,7 +1342,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)/* WA 1408330847 */ if (intel_dp->psr.psr2_sel_fetch_enabled && (IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_A0 ) || -IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 ))) +IS_RKL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 ,DIS_RAM_BYPASS_PSR2_MAN_TRACK ,0 );
drivers/gpu/drm/i915/i915_drv.h +2 -6
@@ -1489,12 +1489,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_TIGERLAKE (__i915) && !(IS_TGL_U (__i915) ||IS_TGL_Y (__i915)) && \ IS_GT_STEP(__i915, since, until)) -#define RKL_REVID_A0 0x0 -#define RKL_REVID_B0 0x1 -#define RKL_REVID_C0 0x4 - -#define IS_RKL_REVID (p, since, until) \ - (IS_ROCKETLAKE(p) && IS_REVID(p, since, until)) +#define IS_RKL_DISPLAY_STEP (p, since, until) \ + (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until))#define DG1_REVID_A0 0x0#define DG1_REVID_B0 0x1
drivers/gpu/drm/i915/intel_step.c +9 -0
@@ -69,6 +69,12 @@ static const struct intel_step_info tgl_revid_step_tbl[] = { [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, }; +static const struct intel_step_info rkl_revid_step_tbl[] = { + [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, + [4 ] = { .gt_step =STEP_C0 , .display_step =STEP_C0 }, +}; +static const struct intel_step_info adls_revid_step_tbl[] = { [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [0x1 ] = { .gt_step =STEP_A0 , .display_step =STEP_A2 },
@@ -97,6 +103,9 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ALDERLAKE_S (i915)) { revids = adls_revid_step_tbl; size =ARRAY_SIZE (adls_revid_step_tbl); + }else if (IS_ROCKETLAKE (i915)) { + revids = rkl_revid_step_tbl; + size =ARRAY_SIZE (rkl_revid_step_tbl); }else if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) { revids = tgl_uy_revid_step_tbl; size =ARRAY_SIZE (tgl_uy_revid_step_tbl);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/7 drm/i915/dg1: Use revid->stepping tables
In reply to Matt RoperSwitch DG1 to use a revid->stepping table as we're trying to do on all platforms going forward.
This removes the last use of IS_REVID() and REVID_FOREVER, so remove those now-unused macros as well to prevent their accidental use on future platforms.
Bspec: 44463
--- .../gpu/drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 18 ++++-------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 8 ++++++++ 6 files changed, 20 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -5799,7 +5799,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)int config, i;if (IS_ALDERLAKE_S (dev_priv) || -IS_DG1_REVID (dev_priv,DG1_REVID_A0 ,DG1_REVID_A0 ) || +IS_DG1_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_A0 ) ||IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ))/* Wa_1409767108:tgl,dg1,adl-s */ table = wa_1409767108_buddy_page_masks;
drivers/gpu/drm/i915/gt/intel_region_lmem.c +1 -1
@@ -157,7 +157,7 @@ intel_gt_setup_fake_lmem(struct intel_gt *gt)static bool get_legacy_lowmem_region (struct intel_uncore *uncore,u64 *start,u32 *size) { -if (!IS_DG1_REVID (uncore->i915,DG1_REVID_A0 ,DG1_REVID_B0 )) +if (!IS_DG1_GT_STEP (uncore->i915,STEP_A0 ,STEP_B0 ))return false; *start =0 ;
drivers/gpu/drm/i915/gt/intel_workarounds.c +5 -5
@@ -1111,7 +1111,7 @@ dg1_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)gen12_gt_workarounds_init (i915, wal);/* Wa_1607087056:dg1 */ -if (IS_DG1_REVID (i915,DG1_REVID_A0 ,DG1_REVID_A0 )) +if (IS_DG1_GT_STEP (i915,STEP_A0 ,STEP_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE ,L3_CLKGATE_DIS |L3_CR2X_CLKGATE_DIS );
@@ -1522,7 +1522,7 @@ static void dg1_whitelist_build(struct intel_engine_cs *engine)tgl_whitelist_build (engine);/* GEN:BUG:1409280441:dg1 */ -if (IS_DG1_REVID (engine->i915,DG1_REVID_A0 ,DG1_REVID_A0 ) && +if (IS_DG1_GT_STEP (engine->i915,STEP_A0 ,STEP_A0 ) && (engine->class ==RENDER_CLASS || engine->class ==COPY_ENGINE_CLASS )) whitelist_reg_ext(w, RING_ID(engine->mmio_base),
@@ -1592,7 +1592,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) {struct drm_i915_private *i915 = engine->i915; -if (IS_DG1_REVID (i915,DG1_REVID_A0 ,DG1_REVID_A0 ) || +if (IS_DG1_GT_STEP (i915,STEP_A0 ,STEP_A0 ) ||IS_TGL_UY_GT_STEP (i915,STEP_A0 ,STEP_A0 )) {/* * Wa_1607138336:tgl[a0],dg1[a0]
@@ -1638,7 +1638,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) }if (IS_ALDERLAKE_P (i915) ||IS_ALDERLAKE_S (i915) || -IS_DG1_REVID (i915,DG1_REVID_A0 ,DG1_REVID_A0 ) || +IS_DG1_GT_STEP (i915,STEP_A0 ,STEP_A0 ) ||IS_ROCKETLAKE (i915) ||IS_TIGERLAKE (i915)) {/* Wa_1409804808:tgl,rkl,dg1[a0],adl-s,adl-p */ wa_masked_en(wal, GEN7_ROW_CHICKEN2,
@@ -1652,7 +1652,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) } -if (IS_DG1_REVID (i915,DG1_REVID_A0 ,DG1_REVID_A0 ) || +if (IS_DG1_GT_STEP (i915,STEP_A0 ,STEP_A0 ) ||IS_ROCKETLAKE (i915) ||IS_TIGERLAKE (i915)) {/* * Wa_1607030317:tgl
drivers/gpu/drm/i915/i915_drv.h +4 -14
@@ -1270,19 +1270,10 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)#define IS_DISPLAY_VER (i915, from, until) \ (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until)) -#define REVID_FOREVER 0xff#define INTEL_REVID (dev_priv) (to_pci_dev((dev_priv)->drm.dev)->revision)#define HAS_DSB (dev_priv) (INTEL_INFO(dev_priv)->display.has_dsb) -/* -* Return true if revision is in range [since,until] inclusive. -* -* Use 0 for open-ended since, and REVID_FOREVER for open-ended until. -*/ -#define IS_REVID (p, since, until) \ - (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) -#define INTEL_DISPLAY_STEP (__i915) (RUNTIME_INFO(__i915)->step.display_step)#define INTEL_GT_STEP (__i915) (RUNTIME_INFO(__i915)->step.gt_step)
@@ -1492,11 +1483,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_RKL_DISPLAY_STEP (p, since, until) \ (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until)) -#define DG1_REVID_A0 0x0 -#define DG1_REVID_B0 0x1 - -#define IS_DG1_REVID (p, since, until) \ - (IS_DG1(p) && IS_REVID(p, since, until)) +#define IS_DG1_GT_STEP (p, since, until) \ + (IS_DG1(p) && IS_GT_STEP(p, since, until)) +#define IS_DG1_DISPLAY_STEP (p, since, until) \ + (IS_DG1(p) && IS_DISPLAY_STEP(p, since, until))#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \ (IS_ALDERLAKE_S(__i915) && \
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7390,7 +7390,7 @@ static void dg1_init_clock_gating(struct drm_i915_private *dev_priv)gen12lp_init_clock_gating (dev_priv);/* Wa_1409836686:dg1[a0] */ -if (IS_DG1_REVID (dev_priv,DG1_REVID_A0 ,DG1_REVID_A0 )) +if (IS_DG1_GT_STEP (dev_priv,STEP_A0 ,STEP_A0 ))intel_uncore_write (&dev_priv->uncore,GEN9_CLKGATE_DIS_3 ,intel_uncore_read (&dev_priv->uncore,GEN9_CLKGATE_DIS_3 ) |DPT_GATING_DIS ); }
drivers/gpu/drm/i915/intel_step.c +8 -0
@@ -75,6 +75,11 @@ static const struct intel_step_info rkl_revid_step_tbl[] = { [4] = { .gt_step = STEP_C0, .display_step = STEP_C0 }, }; +static const struct intel_step_info dg1_revid_step_tbl[] = { + [0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [1 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, +}; +static const struct intel_step_info adls_revid_step_tbl[] = { [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, [0x1 ] = { .gt_step =STEP_A0 , .display_step =STEP_A2 },
@@ -103,6 +108,9 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ALDERLAKE_S (i915)) { revids = adls_revid_step_tbl; size =ARRAY_SIZE (adls_revid_step_tbl); + }else if (IS_DG1 (i915)) { + revids = dg1_revid_step_tbl; + size =ARRAY_SIZE (dg1_revid_step_tbl); }else if (IS_ROCKETLAKE (i915)) { revids = rkl_revid_step_tbl; size =ARRAY_SIZE (rkl_revid_step_tbl);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/7 drm/i915/cnl: Drop all workarounds
In reply to Matt RoperAll of the Cannon Lake hardware that came out had graphics fused off, and our userspace drivers have already dropped their support for the platform; CNL-specific code in i915 that isn't inherited by subsequent platforms is effectively dead code. Let's remove all of the CNL-specific workarounds as a quick and easy first step.
References: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6899
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 55 --------------------- 1 file changed, 55 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +0 -55
@@ -514,35 +514,6 @@ static void cfl_ctx_workarounds_init(struct intel_engine_cs *engine, GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE); } -static void cnl_ctx_workarounds_init (struct intel_engine_cs *engine, -struct i915_wa_list *wal) -{ -/* WaForceContextSaveRestoreNonCoherent:cnl */ -wa_masked_en (wal,CNL_HDC_CHICKEN0 , -HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT ); - -/* WaDisableReplayBufferBankArbitrationOptimization:cnl */ -wa_masked_en (wal,COMMON_SLICE_CHICKEN2 , -GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION ); - -/* WaPushConstantDereferenceHoldDisable:cnl */ -wa_masked_en (wal,GEN7_ROW_CHICKEN2 ,PUSH_CONSTANT_DEREF_DISABLE ); - -/* FtrEnableFastAnisoL1BankingFix:cnl */ -wa_masked_en (wal,HALF_SLICE_CHICKEN3 ,CNL_FAST_ANISO_L1_BANKING_FIX ); - -/* WaDisable3DMidCmdPreemption:cnl */ -wa_masked_dis (wal,GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_3D_OBJECT_LEVEL ); - -/* WaDisableGPGPUMidCmdPreemption:cnl */ -wa_masked_field_set (wal,GEN8_CS_CHICKEN1 , -GEN9_PREEMPT_GPGPU_LEVEL_MASK , -GEN9_PREEMPT_GPGPU_COMMAND_LEVEL ); - -/* WaDisableEarlyEOT:cnl */ -wa_masked_en (wal,GEN8_ROW_CHICKEN ,DISABLE_EARLY_EOT ); -} -static void icl_ctx_workarounds_init (struct intel_engine_cs *engine,struct i915_wa_list *wal) {
@@ -704,8 +675,6 @@ __intel_engine_init_ctx_wa(struct intel_engine_cs *engine,gen12_ctx_workarounds_init (engine, wal); else if (GRAPHICS_VER(i915) == 11) icl_ctx_workarounds_init(engine, wal); - else if (IS_CANNONLAKE(i915)) - cnl_ctx_workarounds_init(engine, wal); else if (IS_COFFEELAKE(i915) || IS_COMETLAKE(i915)) cfl_ctx_workarounds_init(engine, wal); else if (IS_GEMINILAKE(i915))
@@ -982,15 +951,6 @@ icl_wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)wa_write_clr_set (wal,GEN8_MCR_SELECTOR , mcr_mask, mcr); } -static void -cnl_gt_workarounds_init (struct drm_i915_private *i915,struct i915_wa_list *wal) -{ -/* WaInPlaceDecompressionHang:cnl */ -wa_write_or (wal, -GEN9_GAMT_ECO_REG_RW_IA , -GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS ); -} -static void icl_gt_workarounds_init (struct drm_i915_private *i915,struct i915_wa_list *wal) {
@@ -1140,8 +1100,6 @@ gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal)gen12_gt_workarounds_init (i915, wal); else if (GRAPHICS_VER(i915) == 11) icl_gt_workarounds_init(i915, wal); - else if (IS_CANNONLAKE(i915)) - cnl_gt_workarounds_init(i915, wal); else if (IS_COFFEELAKE(i915) || IS_COMETLAKE(i915)) cfl_gt_workarounds_init(i915, wal); else if (IS_GEMINILAKE(i915))
@@ -1418,17 +1376,6 @@ static void cml_whitelist_build(struct intel_engine_cs *engine)cfl_whitelist_build (engine); } -static void cnl_whitelist_build (struct intel_engine_cs *engine) -{ -struct i915_wa_list *w = &engine->whitelist; - -if (engine->class !=RENDER_CLASS ) -return ; - -/* WaEnablePreemptionGranularityControlByUMD:cnl */ -whitelist_reg (w,GEN8_CS_CHICKEN1 ); -} -static void icl_whitelist_build (struct intel_engine_cs *engine) {struct i915_wa_list *w = &engine->whitelist;
@@ -1542,8 +1489,6 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine)tgl_whitelist_build (engine); else if (GRAPHICS_VER(i915) == 11) icl_whitelist_build(engine); - else if (IS_CANNONLAKE(i915)) - cnl_whitelist_build(engine); else if (IS_COMETLAKE(i915)) cml_whitelist_build(engine); else if (IS_COFFEELAKE(i915))
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Minor revid/stepping and workaround cleanup
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Minor revid/stepping and workaround cleanup
URL : https://patchwork.freedesktop.org/series/92299/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 76c5a033ed04 drm/i915: Make pre-production detection use direct revid comparison c88cee5325fe drm/i915/skl: Use revid->stepping tables -:54: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #54: FILE: drivers/gpu/drm/i915/i915_drv.h:1450: +#define IS_SKL_GT_STEP(p, since, until) (IS_SKYLAKE(p) && IS_GT_STEP(p, since, until))
total: 0 errors, 0 warnings, 1 checks, 85 lines checked 4f8fb265f095 drm/i915/icl: Use revid->stepping tables
-:93: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #93: FILE: drivers/gpu/drm/i915/i915_drv.h:1457:
+#define IS_ICL_GT_STEP(p, since, until) \
+ (IS_ICELAKE(p) && IS_GT_STEP(p, since, until))
total: 0 errors, 0 warnings, 1 checks, 94 lines checked 46752176291f drm/i915/jsl_ehl: Use revid->stepping tables
-:51: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #51: FILE: drivers/gpu/drm/i915/i915_drv.h:1460:
+#define IS_JSL_EHL_GT_STEP(p, since, until) \
+ (IS_JSL_EHL(p) && IS_GT_STEP(p, since, until))
-:53: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #53: FILE: drivers/gpu/drm/i915/i915_drv.h:1462:
+#define IS_JSL_EHL_DISPLAY_STEP(p, since, until) \
+ (IS_JSL_EHL(p) && IS_DISPLAY_STEP(p, since, until))
total: 0 errors, 0 warnings, 2 checks, 51 lines checked 54dfa2be0428 drm/i915/rkl: Use revid->stepping tables
-:48: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #48: FILE: drivers/gpu/drm/i915/i915_drv.h:1477:
+#define IS_RKL_DISPLAY_STEP(p, since, until) \
+ (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until))
total: 0 errors, 0 warnings, 1 checks, 51 lines checked 9e913fff5691 drm/i915/dg1: Use revid->stepping tables
-:124: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #124: FILE: drivers/gpu/drm/i915/i915_drv.h:1471:
+#define IS_DG1_GT_STEP(p, since, until) \
+ (IS_DG1(p) && IS_GT_STEP(p, since, until))
-:126: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #126: FILE: drivers/gpu/drm/i915/i915_drv.h:1473:
+#define IS_DG1_DISPLAY_STEP(p, since, until) \
+ (IS_DG1(p) && IS_DISPLAY_STEP(p, since, until))
total: 0 errors, 0 warnings, 2 checks, 118 lines checked c78151696795 drm/i915/cnl: Drop all workarounds
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Minor revid/stepping and workaround cleanup
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Minor revid/stepping and workaround cleanup
URL : https://patchwork.freedesktop.org/series/92299/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/display/intel_display.c:1896:21: expected struct i915_vma *[assigned] vma +drivers/gpu/drm/i915/display/intel_display.c:1896:21: got void [noderef] __iomem *[assigned] iomem +drivers/gpu/drm/i915/display/intel_display.c:1896:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_reset.c:1396:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/intel_ring_submission.c:1210:24: warning: Using plain integer as NULL pointer +drivers/gpu/drm/i915/i915_perf.c:1434:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1488:15: warning: memset with byte count of 16777216 +./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080) +./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Minor revid/stepping and workaround cleanup
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Minor revid/stepping and workaround cleanup
URL : https://patchwork.freedesktop.org/series/92299/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10311 -> Patchwork_20552
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/index.html
Known issues
------------
Here are the changes found in Patchwork_20552 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s0:
- fi-cfl-8109u: [PASS][1] -> [INCOMPLETE][2] ([i915#155])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/fi-cfl-8109u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/fi-cfl-8109u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- {fi-tgl-1115g4}: [FAIL][3] ([i915#1888]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/fi-tgl-1115g4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/fi-tgl-1115g4/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-bdw-5557u: [FAIL][5] ([i915#2722]) -> [FAIL][6] ([i915#1602] / [i915#2029])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/fi-bdw-5557u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/fi-bdw-5557u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
Participating hosts (42 -> 39)
------------------------------
Missing (3): fi-bsw-cyan fi-bdw-samus fi-kbl-8809g
Build changes
-------------
* Linux: CI_DRM_10311 -> Patchwork_20552
CI-20190529: 20190529
CI_DRM_10311: 8a345996f9213fc41d19aca4305e14acc5efd99b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6130: 390edfb703c346f06b0850db71bd3cc1342a3c02 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20552: c78151696795fb5756638759c2a1ff6d29274de4 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c78151696795 drm/i915/cnl: Drop all workarounds9e913fff5691 drm/i915/dg1: Use revid->stepping tables54dfa2be0428 drm/i915/rkl: Use revid->stepping tables46752176291f drm/i915/jsl_ehl: Use revid->stepping tables 4f8fb265f095 drm/i915/icl: Use revid->stepping tablesc88cee5325fe drm/i915/skl: Use revid->stepping tables76c5a033ed04 drm/i915: Make pre-production detection use direct revid comparison
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 10 lines · Matt Roper
PCI revision IDs don't always map to GT and display IP steppings in an intuitive/sensible way. On many of our recent platforms we've switched to using
revid->steppinglookup tables with the infrastructure inintel_step.cto handle stepping lookups and comparisons. Since it's confusing to have some of our platforms using the new lookup tables and some still using old revid comparisons, let's migrate all the old platforms over to the table approach since that's what we want to standardize on going forward. The only place that revision ID's should really get used directly now is when checking to see if we're running on pre-production hardware.
Anusha, Matt, please sort this out between the two of you. :)
https://patchwork.freedesktop.org/series/92257/
BR,
Jani.
Quoted 26 lines
Let's also take the opportunity to drop a bit of effectively dead code in the workarounds file too.
Cc Jani Nikula <[email protected]>Matt Roper (7):
drm/i915: Make pre-production detection use direct revid comparison drm/i915/skl: Userevid->steppingtables
drm/i915/icl: Userevid->steppingtables drm/i915/jsl_ehl: Userevid->steppingtables drm/i915/rkl: Userevid->steppingtables
drm/i915/dg1: Userevid->steppingtables
drm/i915/cnl: Drop all workarounds.../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 81 +++---------------- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 80 +++--------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 72 +++++++++++++++-- drivers/gpu/drm/i915/intel_step.h | 7 ++ 10 files changed, 107 insertions(+), 153 deletions(-)
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Thursday, July 8, 2021 12:33 AM
To: Roper, Matthew D <[email protected]>; intel- [email protected]
Cc: Srivatsa, Anusha <[email protected]>
Subject: Re: [PATCH 0/7] Minor revid/stepping and workaround cleanupQuoted 10 lines · Matt Roper
PCI revision IDs don't always map to GT and display IP steppings in an intuitive/sensible way. On many of our recent platforms we've switched to using
revid->steppinglookup tables with the infrastructure inintel_step.cto handle stepping lookups and comparisons. Since it's confusing to have some of our platforms using the new lookup tables and some still using old revid comparisons, let's migrate all the old platforms over to the table approach since that's what we want to standardize on going forward. The only place that revision ID's should really get used directly now is when checking to see if we're running on pre-production hardware.
Quoted 4 lines
Anusha, Matt, please sort this out between the two of you. :)
@Roper, Matthew D the series doesn't add the steeping table for BXT and GLK.
Anusha
Quoted 31 lines
BR,
Jani.Quoted 15 lines
Let's also take the opportunity to drop a bit of effectively dead code in the workarounds file too.
Cc Jani Nikula <[email protected]>Matt Roper (7):
drm/i915: Make pre-production detection use direct revid comparison drm/i915/skl: Userevid->steppingtables
drm/i915/icl: Userevid->steppingtables drm/i915/jsl_ehl: Userevid->steppingtables drm/i915/rkl: Userevid->steppingtables
drm/i915/dg1: Userevid->steppingtables
drm/i915/cnl: Drop all workaroundsQuoted 11 lines
.../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 81 +++---------------- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 80 +++--------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 72 +++++++++++++++-- drivers/gpu/drm/i915/intel_step.h | 7 ++ 10 files changed, 107 insertions(+), 153 deletions(-)
Quoted 2 lines
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Anusha
Quoted 22 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Thursday, July 8, 2021 12:33 AM
To: Roper, Matthew D <[email protected]>; intel- [email protected]
Cc: Srivatsa, Anusha <[email protected]>
Subject: Re: [PATCH 0/7] Minor revid/stepping and workaround cleanupQuoted 10 lines · Matt Roper
PCI revision IDs don't always map to GT and display IP steppings in an intuitive/sensible way. On many of our recent platforms we've switched to using
revid->steppinglookup tables with the infrastructure inintel_step.cto handle stepping lookups and comparisons. Since it's confusing to have some of our platforms using the new lookup tables and some still using old revid comparisons, let's migrate all the old platforms over to the table approach since that's what we want to standardize on going forward. The only place that revision ID's should really get used directly now is when checking to see if we're running on pre-production hardware.
Quoted 5 lines
Quoted 4 lines
Anusha, Matt, please sort this out between the two of you. :)
@Roper, Matthew D the series doesn't add the steeping table for BXT and GLK.
Right, that was intentional because we don't use the steppings for those platforms anywhere in the code. But if that's changing with your DMC series, I can add the tables for those two as well.
Matt
Quoted 35 lines
Anusha
Quoted 33 lines
BR,
Jani.Quoted 15 lines
Let's also take the opportunity to drop a bit of effectively dead code in the workarounds file too.
Cc Jani Nikula <[email protected]>Matt Roper (7):
drm/i915: Make pre-production detection use direct revid comparison drm/i915/skl: Userevid->steppingtables
drm/i915/icl: Userevid->steppingtables drm/i915/jsl_ehl: Userevid->steppingtables drm/i915/rkl: Userevid->steppingtables
drm/i915/dg1: Userevid->steppingtables
drm/i915/cnl: Drop all workaroundsQuoted 11 lines
.../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 81 +++---------------- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 80 +++--------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 72 +++++++++++++++-- drivers/gpu/drm/i915/intel_step.h | 7 ++ 10 files changed, 107 insertions(+), 153 deletions(-)--
Jani Nikula, Intel Open Source Graphics Center
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
Quoted 35 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Thursday, July 8, 2021 4:05 PM
To: Srivatsa, Anusha <[email protected]>
Cc: Jani Nikula <[email protected]>; [email protected]
Subject: Re: [PATCH 0/7] Minor revid/stepping and workaround cleanupQuoted 11 lines · Anusha
Quoted 11 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Thursday, July 8, 2021 12:33 AM
To: Roper, Matthew D <[email protected]>; intel- [email protected]
Cc: Srivatsa, Anusha <[email protected]>
Subject: Re: [PATCH 0/7] Minor revid/stepping and workaround cleanupOn Wed, 07 Jul 2021, Matt Roper <[email protected]> wrote:
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
PCI revision IDs don't always map to GT and display IP steppings in an intuitive/sensible way. On many of our recent platforms we've switched to using
revid->steppinglookup tables with the infrastructure inintel_step.cto handle stepping lookups and comparisons. Since it's confusing to have some of our platforms using the new lookup tables and some still using old revid comparisons, let's migrate all the old platforms over to the table approach since that's what we want to standardize on going forward. The only place that revision ID's should really get used directly now is when checking to see if we're running on pre-productionhardware.
Quoted 3 lines
Quoted 3 lines
Anusha, Matt, please sort this out between the two of you. :)
Quoted 9 lines
Quoted 3 lines
Quoted 2 lines
@Roper, Matthew D the series doesn't add the steeping table for BXT and
GLK.
Right, that was intentional because we don't use the steppings for those platforms anywhere in the code. But if that's changing with your DMC series, I can add the tables for those two as well.
Yes, will need GLK and BXT
Thanks
Anusha
Quoted 38 lines
Matt
Quoted 35 lines
Anusha
Quoted 33 lines
BR,
Jani.Quoted 15 lines
Let's also take the opportunity to drop a bit of effectively dead code in the workarounds file too.
Cc Jani Nikula <[email protected]>Matt Roper (7):
drm/i915: Make pre-production detection use direct revid comparison drm/i915/skl: Userevid->steppingtables
drm/i915/icl: Userevid->steppingtables drm/i915/jsl_ehl: Userevid->steppingtables drm/i915/rkl: Userevid->steppingtables
drm/i915/dg1: Userevid->steppingtables
drm/i915/cnl: Drop all workaroundsQuoted 11 lines
.../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 81 +++---------------- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 80 +++--------------- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_step.c | 72 +++++++++++++++-- drivers/gpu/drm/i915/intel_step.h | 7 ++ 10 files changed, 107 insertions(+), 153 deletions(-)--
Jani Nikula, Intel Open Source Graphics Center
Quoted 6 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
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Minor revid/stepping and workaround cleanup
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Minor revid/stepping and workaround cleanup
URL : https://patchwork.freedesktop.org/series/92299/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10311_full -> Patchwork_20552_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20552_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20552_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20552_full:
### IGT changes ###
#### Possible regressions ####
* igt@core_hotunplug@unbind-rebind:
- shard-snb: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-snb6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-snb5/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_fair@basic-deadline:
- {shard-rkl}: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-2/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-aux-stride-yf_tiled_ccs:
- {shard-rkl}: [FAIL][5] ([i915#3678]) -> [SKIP][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@kms_ccs@pipe-a-bad-aux-stride-yf_tiled_ccs.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@kms_ccs@pipe-a-bad-aux-stride-yf_tiled_ccs.html
* igt@kms_flip_tiling@flip-changes-tiling-y:
- {shard-rkl}: NOTRUN -> [SKIP][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-5/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_20552_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@display-3x:
- shard-iclb: NOTRUN -> [SKIP][8] ([i915#1839])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-apl: NOTRUN -> [DMESG-WARN][9] ([i915#180]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_persistence@legacy-engines-mixed:
- shard-snb: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#1099])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-snb2/igt@[email protected]
* igt@gem_ctx_persistence@smoketest:
- shard-tglb: [PASS][11] -> [FAIL][12] ([i915#2896])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb1/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][13] -> [TIMEOUT][14] ([i915#2369] / [i915#3063] / [i915#3648])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb1/igt@[email protected]
- shard-iclb: [PASS][15] -> [TIMEOUT][16] ([i915#2369] / [i915#2481] / [i915#3070])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb4/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb6/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#2842])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb3/igt@gem_exec_fair@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: NOTRUN -> [FAIL][19] ([i915#2842])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@rcs0:
- shard-glk: [PASS][20] -> [FAIL][21] ([i915#2842]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-glk5/igt@gem_exec_fair@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-glk7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [PASS][22] -> [SKIP][23] ([fdo#109271])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-kbl7/igt@gem_exec_fair@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][24] -> [FAIL][25] ([i915#2842]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb5/igt@gem_exec_fair@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_params@no-blt:
- shard-iclb: NOTRUN -> [SKIP][26] ([fdo#109283])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@gem_exec_reloc@basic-wide-active@bcs0:
- shard-apl: NOTRUN -> [FAIL][27] ([i915#3633]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@gem_exec_reloc@[email protected]
* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][28] ([i915#3633]) +2 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-snb2/igt@gem_exec_reloc@[email protected]
* igt@gem_exec_reloc@basic-wide-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][29] ([i915#3633])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@gem_exec_reloc@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#2190])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][31] ([i915#3002])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl8/igt@[email protected]
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-iclb: NOTRUN -> [SKIP][32] ([i915#3297])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@gem_vm_create@destroy-race:
- shard-tglb: [PASS][33] -> [FAIL][34] ([i915#2822])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb1/igt@[email protected]
* igt@gen7_exec_parse@chained-batch:
- shard-iclb: NOTRUN -> [SKIP][35] ([fdo#109289]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][36] -> [FAIL][37] ([i915#454])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb4/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb6/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- shard-iclb: NOTRUN -> [FAIL][38] ([i915#3343])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: NOTRUN -> [WARN][39] ([i915#1804] / [i915#2684])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@i915_suspend@forcewake:
- shard-kbl: [PASS][40] -> [DMESG-WARN][41] ([i915#180]) +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-kbl4/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl4/igt@[email protected]
* igt@kms_big_fb@x-tiled-16bpp-rotate-90:
- shard-iclb: NOTRUN -> [SKIP][42] ([fdo#110725] / [fdo#111614])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_big_joiner@basic:
- shard-iclb: NOTRUN -> [SKIP][43] ([i915#2705])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][44] ([fdo#109271]) +19 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl2/igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_cdclk@plane-scaling:
- shard-iclb: NOTRUN -> [SKIP][45] ([i915#3742])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_chamelium@dp-crc-multiple:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +15 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl8/igt@[email protected]
* igt@kms_chamelium@dp-frame-dump:
- shard-kbl: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +6 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-red-to-blue:
- shard-iclb: NOTRUN -> [SKIP][48] ([fdo#109284] / [fdo#111827]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-25:
- shard-snb: NOTRUN -> [SKIP][49] ([fdo#109271] / [fdo#111827]) +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-snb2/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-5:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl4/igt@[email protected]
* igt@kms_content_protection@dp-mst-lic-type-0:
- shard-iclb: NOTRUN -> [SKIP][51] ([i915#3116])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-random:
- shard-skl: [PASS][52] -> [FAIL][53] ([i915#3444])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl6/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl9/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-512x512-offscreen:
- shard-iclb: NOTRUN -> [SKIP][54] ([fdo#109278] / [fdo#109279])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: NOTRUN -> [DMESG-WARN][55] ([i915#180]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-64x21-sliding:
- shard-iclb: NOTRUN -> [SKIP][56] ([fdo#109278]) +10 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-a-256x256-top-edge:
- shard-skl: [PASS][57] -> [DMESG-WARN][58] ([i915#1982])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl3/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][59] -> [FAIL][60] ([i915#2346] / [i915#533])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-skl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#533])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl2/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled:
- shard-skl: [PASS][62] -> [FAIL][63] ([i915#3451])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl6/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl9/igt@[email protected]
* igt@kms_flip@2x-flip-vs-modeset-vs-hang:
- shard-iclb: NOTRUN -> [SKIP][64] ([fdo#109274]) +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1:
- shard-skl: [PASS][65] -> [FAIL][66] ([i915#2122])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl8/igt@kms_flip@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl6/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-apl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#2672])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-iclb: NOTRUN -> [SKIP][68] ([i915#2587])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-shrfb-draw-blt:
- shard-iclb: NOTRUN -> [SKIP][69] ([fdo#109280]) +6 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-shrfb-draw-blt.html
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-tglb: [PASS][70] -> [DMESG-WARN][71] ([i915#2411])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb2/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb6/igt@[email protected]
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][72] -> [FAIL][73] ([i915#1188])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl9/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl2/igt@[email protected]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-apl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#533]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl6/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#533])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-apl: [PASS][76] -> [DMESG-WARN][77] ([i915#180])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-apl2/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][78] -> [FAIL][79] ([fdo#108145] / [i915#265])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl6/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][80] ([fdo#108145] / [i915#265])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-kbl: NOTRUN -> [FAIL][81] ([fdo#108145] / [i915#265])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][82] ([fdo#108145] / [i915#265])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl4/igt@[email protected]
* igt@kms_plane_cursor@pipe-c-viewport-size-128:
- shard-snb: NOTRUN -> [SKIP][83] ([fdo#109271]) +62 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-snb2/igt@[email protected]
* igt@kms_plane_lowres@pipe-c-tiling-x:
- shard-iclb: NOTRUN -> [SKIP][84] ([i915#3536])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-apl: NOTRUN -> [SKIP][85] ([fdo#109271] / [i915#658]) +3 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl8/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
- shard-iclb: NOTRUN -> [SKIP][86] ([i915#658])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-kbl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#658])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][88] -> [SKIP][89] ([fdo#109642] / [fdo#111068] / [i915#658])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb2/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [PASS][90] -> [SKIP][91] ([fdo#109441])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb1/igt@kms_psr@psr2_cursor_plane_onoff.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: NOTRUN -> [SKIP][92] ([fdo#109441]) +1 similar issue
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][93] ([IGT#2])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@kms_sysfs_edid_timing.html
* igt@kms_writeback@writeback-fb-id:
- shard-iclb: NOTRUN -> [SKIP][94] ([i915#2437])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@kms_writeback@writeback-invalid-parameters:
- shard-apl: NOTRUN -> [SKIP][95] ([fdo#109271] / [i915#2437])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl6/igt@[email protected]
* igt@kms_writeback@writeback-pixel-formats:
- shard-kbl: NOTRUN -> [SKIP][96] ([fdo#109271] / [i915#2437])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@[email protected]
* igt@nouveau_crc@pipe-c-ctx-flip-skip-current-frame:
- shard-iclb: NOTRUN -> [SKIP][97] ([i915#2530])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb4/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: [PASS][98] -> [FAIL][99] ([i915#1542])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl6/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl9/igt@[email protected]
* igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name:
- shard-apl: NOTRUN -> [SKIP][100] ([fdo#109271]) +187 similar issues
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name.html
* igt@prime_nv_pcopy@test2:
- shard-kbl: NOTRUN -> [SKIP][101] ([fdo#109271]) +76 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl6/igt@[email protected]
* igt@sysfs_clients@fair-7:
- shard-apl: NOTRUN -> [SKIP][102] ([fdo#109271] / [i915#2994]) +2 similar issues
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl2/igt@[email protected]
* igt@sysfs_clients@split-25:
- shard-kbl: NOTRUN -> [SKIP][103] ([fdo#109271] / [i915#2994])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl6/igt@[email protected]
* igt@vgem_basic@unload:
- shard-kbl: NOTRUN -> [INCOMPLETE][104] ([i915#3744])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-skl: [INCOMPLETE][105] ([i915#146] / [i915#198] / [i915#2910]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl3/igt@gem_ctx_isolation@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl4/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-kbl: [DMESG-WARN][107] ([i915#180]) -> [PASS][108] +6 similar issues
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-kbl1/igt@gem_ctx_isolation@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl3/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_persistence@legacy-engines-hostile@bsd:
- {shard-rkl}: [FAIL][109] ([i915#2410]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-5/igt@gem_ctx_persistence@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-2/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [FAIL][111] ([i915#2842]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-tglb1/igt@gem_exec_fair@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [DMESG-WARN][113] ([i915#1436] / [i915#716]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-kbl7/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-kbl7/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- {shard-rkl}: [SKIP][115] ([fdo#109308]) -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [INCOMPLETE][117] ([i915#146] / [i915#151]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl6/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl8/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- {shard-rkl}: [DMESG-FAIL][119] ([i915#1021]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-5/igt@i915_selftest@live@gt_pm.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-2/igt@i915_selftest@live@gt_pm.html
* igt@i915_suspend@forcewake:
- shard-apl: [DMESG-WARN][121] ([i915#180]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-apl6/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-apl3/igt@[email protected]
* igt@kms_atomic@test-only:
- {shard-rkl}: [SKIP][123] ([i915#1845]) -> [PASS][124] +20 similar issues
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-iclb: [DMESG-WARN][125] ([i915#1226]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-iclb5/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-iclb2/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- {shard-rkl}: [SKIP][127] ([i915#3638]) -> [PASS][128] +2 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-5/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip:
- {shard-rkl}: [SKIP][129] ([i915#3721]) -> [PASS][130] +1 similar issue
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html
* igt@kms_big_fb@y-tiled-16bpp-rotate-90:
- {shard-rkl}: [SKIP][131] ([fdo#111614]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- {shard-rkl}: [FAIL][133] ([i915#3678]) -> [PASS][134] +3 similar issues
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_color@pipe-b-ctm-red-to-blue:
- shard-skl: [DMESG-WARN][135] ([i915#1982]) -> [PASS][136] +1 similar issue
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl9/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-skl9/igt@[email protected]
* igt@kms_color@pipe-c-degamma:
- {shard-rkl}: [SKIP][137] ([i915#1149] / [i915#1849]) -> [PASS][138] +2 similar issues
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-2/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-128x42-random:
- {shard-rkl}: [SKIP][139] ([fdo#112022]) -> [PASS][140] +8 similar issues
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-rkl-5/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- shard-skl: [FAIL][141] ([i915#2346]) -> [PASS][142]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10311/shard-skl2/igt@kms_cursor_legacy@basi
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20552/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx