* [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC
@ 2021-07-01 19:31 Anusha Srivatsa
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2021-07-01 19:31 UTC (permalink / raw)
To: intel-gfx
This series addresses the following:
1. Add missing stepping/substepping info for all platforms.
2. Use RUNTIME_INFO->step to grab the actual stepping info
for a platform instead of having separate lookup tables
for each platform on DMC side.
Anusha Srivatsa (2):
drm/i915/dmc: Use RUNTIME_INFO->step for DMC
drm/i915/dmc: Add steping info table for remaining platforms
drivers/gpu/drm/i915/display/intel_dmc.c | 117 +++++++++++++++--------
drivers/gpu/drm/i915/intel_step.c | 69 +++++++++++++
drivers/gpu/drm/i915/intel_step.h | 7 ++
3 files changed, 154 insertions(+), 39 deletions(-)
--
2.32.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step for DMC
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
@ 2021-07-01 19:31 ` Anusha Srivatsa
2021-07-02 8:56 ` kernel test robot
2021-07-05 10:01 ` Jani Nikula
2021-07-01 19:31 ` [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms Anusha Srivatsa
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2021-07-01 19:31 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
On the dmc side,we maintain a lookup table with different display
stepping-substepping combinations.
Instead of adding new table for every new platform, lets ues
the stepping info from RUNTIME_INFO(dev_priv)->step
v2: Add stepping table for older platforms in intel_step.c (Lucas)
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/display/intel_dmc.c | 117 +++++++++++++++--------
drivers/gpu/drm/i915/intel_step.c | 41 ++++++++
drivers/gpu/drm/i915/intel_step.h | 7 ++
3 files changed, 126 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index f8789d4543bf..df888a3d086e 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -247,50 +247,89 @@ bool intel_dmc_has_payload(struct drm_i915_private *i915)
return i915->dmc.dmc_info[DMC_FW_MAIN].payload;
}
-static const struct stepping_info skl_stepping_info[] = {
- {'A', '0'}, {'B', '0'}, {'C', '0'},
- {'D', '0'}, {'E', '0'}, {'F', '0'},
- {'G', '0'}, {'H', '0'}, {'I', '0'},
- {'J', '0'}, {'K', '0'}
-};
-
-static const struct stepping_info bxt_stepping_info[] = {
- {'A', '0'}, {'A', '1'}, {'A', '2'},
- {'B', '0'}, {'B', '1'}, {'B', '2'}
-};
-
-static const struct stepping_info icl_stepping_info[] = {
- {'A', '0'}, {'A', '1'}, {'A', '2'},
- {'B', '0'}, {'B', '2'},
- {'C', '0'}
-};
-
static const struct stepping_info no_stepping_info = { '*', '*' };
+struct stepping_info *display_step;
-static const struct stepping_info *
+static struct stepping_info *
intel_get_stepping_info(struct drm_i915_private *dev_priv)
{
- const struct stepping_info *si;
- unsigned int size;
-
- if (IS_ICELAKE(dev_priv)) {
- size = ARRAY_SIZE(icl_stepping_info);
- si = icl_stepping_info;
- } else if (IS_SKYLAKE(dev_priv)) {
- size = ARRAY_SIZE(skl_stepping_info);
- si = skl_stepping_info;
- } else if (IS_BROXTON(dev_priv)) {
- size = ARRAY_SIZE(bxt_stepping_info);
- si = bxt_stepping_info;
- } else {
- size = 0;
- si = NULL;
+ struct intel_step_info step = RUNTIME_INFO(dev_priv)->step;
+
+ switch (step.display_step) {
+ case STEP_A0:
+ display_step->stepping = 'A';
+ display_step->substepping = '0';
+ break;
+ case STEP_A1:
+ display_step->stepping = 'A';
+ display_step->substepping = '1';
+ break;
+ case STEP_A2:
+ display_step->stepping = 'A';
+ display_step->substepping = '2';
+ break;
+ case STEP_B0:
+ display_step->stepping = 'B';
+ display_step->substepping = '0';
+ break;
+ case STEP_B1:
+ display_step->stepping = 'B';
+ display_step->substepping = '1';
+ break;
+ case STEP_B2:
+ display_step->stepping = 'B';
+ display_step->substepping = '2';
+ break;
+ case STEP_C0:
+ display_step->stepping = 'C';
+ display_step->substepping = '0';
+ break;
+ case STEP_C1:
+ display_step->stepping = 'C';
+ display_step->substepping = '1';
+ break;
+ case STEP_D0:
+ display_step->stepping = 'D';
+ display_step->substepping = '0';
+ break;
+ case STEP_D1:
+ display_step->stepping = 'D';
+ display_step->substepping = '1';
+ break;
+ case STEP_E0:
+ display_step->stepping = 'E';
+ display_step->substepping = '0';
+ break;
+ case STEP_F0:
+ display_step->stepping = 'F';
+ display_step->substepping = '0';
+ break;
+ case STEP_G0:
+ display_step->stepping = 'G';
+ display_step->substepping = '0';
+ break;
+ case STEP_H0:
+ display_step->stepping = 'H';
+ display_step->substepping = '0';
+ break;
+ case STEP_I0:
+ display_step->stepping = 'I';
+ display_step->substepping = '0';
+ break;
+ case STEP_J0:
+ display_step->stepping = 'J';
+ display_step->substepping = '0';
+ break;
+ case STEP_K0:
+ display_step->stepping = 'K';
+ display_step->substepping = '0';
+ break;
+ default:
+ display_step->stepping = '*';
+ display_step->substepping = '*';
+ break;
}
-
- if (INTEL_REVID(dev_priv) < size)
- return si + INTEL_REVID(dev_priv);
-
- return &no_stepping_info;
+ return display_step;
}
static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index ba9479a67521..c8542161c5d0 100644
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -15,6 +15,38 @@
/* FIXME: what about REVID_E0 */
+static const struct intel_step_info bxt_revid_step_tbl[] = {
+ [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
+ [1] = { .gt_step = STEP_A1, .display_step = STEP_A1 },
+ [2] = { .gt_step = STEP_A2, .display_step = STEP_A2 },
+ [6] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
+ [7] = { .gt_step = STEP_B1, .display_step = STEP_B1 },
+ [8] = { .gt_step = STEP_B2, .display_step = STEP_B2 },
+};
+
+
+static const struct intel_step_info skl_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_C0 },
+ [3] = { .gt_step = STEP_D0, .display_step = STEP_D0 },
+ [4] = { .gt_step = STEP_E0, .display_step = STEP_E0 },
+ [5] = { .gt_step = STEP_F0, .display_step = STEP_F0 },
+ [6] = { .gt_step = STEP_G0, .display_step = STEP_G0 },
+ [7] = { .gt_step = STEP_H0, .display_step = STEP_H0 },
+ [8] = { .gt_step = STEP_I0, .display_step = STEP_I0 },
+ [9] = { .gt_step = STEP_J0, .display_step = STEP_J0 },
+};
+
+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 kbl_revids[] = {
[0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
[1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
@@ -76,6 +108,15 @@ void intel_step_init(struct drm_i915_private *i915)
} else if (IS_KABYLAKE(i915)) {
revids = kbl_revids;
size = ARRAY_SIZE(kbl_revids);
+ } else if (IS_ICELAKE(i915)) {
+ revids = icl_revid_step_tbl;
+ size = ARRAY_SIZE(icl_revid_step_tbl);
+ } else if (IS_SKYLAKE(i915)) {
+ revids = skl_revid_step_tbl;
+ size = ARRAY_SIZE(skl_revid_step_tbl);
+ } else if (IS_BROXTON(i915)) {
+ revids = bxt_revid_step_tbl;
+ size = ARRAY_SIZE(bxt_revid_step_tbl);
}
/* Not using the stepping scheme for the platform yet. */
diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h
index 958a8bb5d677..1bffa41f2660 100644
--- a/drivers/gpu/drm/i915/intel_step.h
+++ b/drivers/gpu/drm/i915/intel_step.h
@@ -22,15 +22,22 @@ struct intel_step_info {
enum intel_step {
STEP_NONE = 0,
STEP_A0,
+ STEP_A1,
STEP_A2,
STEP_B0,
STEP_B1,
+ STEP_B2,
STEP_C0,
+ STEP_C1,
STEP_D0,
STEP_D1,
STEP_E0,
STEP_F0,
STEP_G0,
+ STEP_H0,
+ STEP_I0,
+ STEP_J0,
+ STEP_K0,
STEP_FUTURE,
STEP_FOREVER,
};
--
2.32.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
@ 2021-07-01 19:31 ` Anusha Srivatsa
2021-07-05 10:05 ` Jani Nikula
2021-07-02 0:48 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Stepping/substepping reorg for DMC Patchwork
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Anusha Srivatsa @ 2021-07-01 19:31 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
intel_step.c has stepping_info for most platforms. With DMC using
display_step from here, lets add the info for all older platforms
as well
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_step.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index c8542161c5d0..d8f5ef9ac158 100644
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -38,6 +38,13 @@ static const struct intel_step_info skl_revid_step_tbl[] = {
[9] = { .gt_step = STEP_J0, .display_step = STEP_J0 },
};
+static const struct intel_step_info glk_revid_step_tbl[] = {
+ [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
+ [1] = { .gt_step = STEP_A1, .display_step = STEP_A1 },
+ [2] = { .gt_step = STEP_A2, .display_step = STEP_A2 },
+ [3] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
+};
+
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 },
@@ -71,6 +78,18 @@ 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 dg1_revid_step_tbl[] = {
+ [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
+ [0x1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
+};
+
+static const struct intel_step_info rkl_revid_step_tbl[] = {
+ [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
+ [0x1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
+ [0x4] = { .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 },
@@ -99,6 +118,12 @@ 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_DG1(i915)) {
+ revids = dg1_revid_step_tbl;
+ size = ARRAY_SIZE(dg1_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);
@@ -111,6 +136,9 @@ void intel_step_init(struct drm_i915_private *i915)
} else if (IS_ICELAKE(i915)) {
revids = icl_revid_step_tbl;
size = ARRAY_SIZE(icl_revid_step_tbl);
+ } else if (IS_GEMINILAKE(i915)) {
+ revids = glk_revid_step_tbl;
+ size = ARRAY_SIZE(glk_revid_step_tbl);
} else if (IS_SKYLAKE(i915)) {
revids = skl_revid_step_tbl;
size = ARRAY_SIZE(skl_revid_step_tbl);
--
2.32.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Stepping/substepping reorg for DMC
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
2021-07-01 19:31 ` [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms Anusha Srivatsa
@ 2021-07-02 0:48 ` Patchwork
2021-07-02 0:50 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-07-02 1:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2021-07-02 0:48 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: Stepping/substepping reorg for DMC
URL : https://patchwork.freedesktop.org/series/92132/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
89d374a999d0 drm/i915/dmc: Use RUNTIME_INFO->step for DMC
-:167: CHECK:LINE_SPACING: Please don't use multiple blank lines
#167: FILE: drivers/gpu/drm/i915/intel_step.c:27:
+
+
total: 0 errors, 0 warnings, 1 checks, 203 lines checked
cfef0bcd32fe drm/i915/dmc: Add steping info table for remaining platforms
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Stepping/substepping reorg for DMC
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
` (2 preceding siblings ...)
2021-07-02 0:48 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Stepping/substepping reorg for DMC Patchwork
@ 2021-07-02 0:50 ` Patchwork
2021-07-02 1:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2021-07-02 0:50 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: Stepping/substepping reorg for DMC
URL : https://patchwork.freedesktop.org/series/92132/
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/display/intel_dmc.c:251:22: warning: symbol 'display_step' was not declared. Should it be static?
+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:1207: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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for Stepping/substepping reorg for DMC
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
` (3 preceding siblings ...)
2021-07-02 0:50 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2021-07-02 1:17 ` Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2021-07-02 1:17 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 3342 bytes --]
== Series Details ==
Series: Stepping/substepping reorg for DMC
URL : https://patchwork.freedesktop.org/series/92132/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10301 -> Patchwork_20516
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20516 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_20516, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/index.html
Known issues
------------
Here are the changes found in Patchwork_20516 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-bsw-kefka: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/fi-bsw-kefka/igt@amdgpu/amd_basic@query-info.html
* igt@amdgpu/amd_basic@semaphore:
- fi-bsw-nick: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/fi-bsw-nick/igt@amdgpu/amd_basic@semaphore.html
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][3] ([i915#2782] / [i915#2940]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10301/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/fi-bsw-nick/igt@i915_selftest@live@execlists.html
- fi-bsw-kefka: [INCOMPLETE][5] ([i915#2782] / [i915#2940]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10301/fi-bsw-kefka/igt@i915_selftest@live@execlists.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/fi-bsw-kefka/igt@i915_selftest@live@execlists.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
Participating hosts (37 -> 14)
------------------------------
ERROR: It appears as if the changes made in Patchwork_20516 prevented too many machines from booting.
Missing (23): fi-kbl-soraka fi-icl-u2 fi-apl-guc fi-icl-y fi-skl-6600u fi-bxt-dsi fi-cml-s fi-glk-dsi fi-kbl-7500u fi-skl-6700k2 fi-kbl-r fi-kbl-7567u fi-tgl-dsi fi-cfl-8700k fi-dg1-1 fi-ehl-2 fi-jsl-1 fi-tgl-1115g4 fi-bsw-cyan fi-kbl-guc fi-cfl-8109u fi-kbl-8809g fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10301 -> Patchwork_20516
CI-20190529: 20190529
CI_DRM_10301: 3d3ff5917ce204b783f4847c14e8839fde358a3a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6128: b24e5949af7e51f0af484d2ce4cb4c5a41ac5358 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20516: cfef0bcd32febba37c4b26ceaea5bb175a2163bc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cfef0bcd32fe drm/i915/dmc: Add steping info table for remaining platforms
89d374a999d0 drm/i915/dmc: Use RUNTIME_INFO->step for DMC
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20516/index.html
[-- Attachment #1.2: Type: text/html, Size: 4257 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step for DMC
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
@ 2021-07-02 8:56 ` kernel test robot
2021-07-05 10:01 ` Jani Nikula
1 sibling, 0 replies; 11+ messages in thread
From: kernel test robot @ 2021-07-02 8:56 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx; +Cc: Lucas De Marchi, clang-built-linux, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2546 bytes --]
Hi Anusha,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20210701]
[cannot apply to drm-intel/for-linux-next v5.13]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/Stepping-substepping-reorg-for-DMC/20210702-033236
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: x86_64-randconfig-a015-20210630 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 9eb613b2de3163686b1a4bd1160f15ac56a4b083)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/5d13218aefcba8e3bc4c4d4371988e08e0cf8bd3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Anusha-Srivatsa/Stepping-substepping-reorg-for-DMC/20210702-033236
git checkout 5d13218aefcba8e3bc4c4d4371988e08e0cf8bd3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_dmc.c:250:35: warning: unused variable 'no_stepping_info' [-Wunused-const-variable]
static const struct stepping_info no_stepping_info = { '*', '*' };
^
1 warning generated.
vim +/no_stepping_info +250 drivers/gpu/drm/i915/display/intel_dmc.c
03256487fee340 drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-05-26 249
1bb4308e713042 drivers/gpu/drm/i915/intel_csr.c Chris Wilson 2016-03-07 @250 static const struct stepping_info no_stepping_info = { '*', '*' };
5d13218aefcba8 drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-07-01 251 struct stepping_info *display_step;
1bb4308e713042 drivers/gpu/drm/i915/intel_csr.c Chris Wilson 2016-03-07 252
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 46324 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step for DMC
@ 2021-07-02 8:56 ` kernel test robot
0 siblings, 0 replies; 11+ messages in thread
From: kernel test robot @ 2021-07-02 8:56 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2596 bytes --]
Hi Anusha,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20210701]
[cannot apply to drm-intel/for-linux-next v5.13]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/Stepping-substepping-reorg-for-DMC/20210702-033236
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: x86_64-randconfig-a015-20210630 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 9eb613b2de3163686b1a4bd1160f15ac56a4b083)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/5d13218aefcba8e3bc4c4d4371988e08e0cf8bd3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Anusha-Srivatsa/Stepping-substepping-reorg-for-DMC/20210702-033236
git checkout 5d13218aefcba8e3bc4c4d4371988e08e0cf8bd3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_dmc.c:250:35: warning: unused variable 'no_stepping_info' [-Wunused-const-variable]
static const struct stepping_info no_stepping_info = { '*', '*' };
^
1 warning generated.
vim +/no_stepping_info +250 drivers/gpu/drm/i915/display/intel_dmc.c
03256487fee340 drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-05-26 249
1bb4308e713042 drivers/gpu/drm/i915/intel_csr.c Chris Wilson 2016-03-07 @250 static const struct stepping_info no_stepping_info = { '*', '*' };
5d13218aefcba8 drivers/gpu/drm/i915/display/intel_dmc.c Anusha Srivatsa 2021-07-01 251 struct stepping_info *display_step;
1bb4308e713042 drivers/gpu/drm/i915/intel_csr.c Chris Wilson 2016-03-07 252
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 46324 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step for DMC
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
2021-07-02 8:56 ` kernel test robot
@ 2021-07-05 10:01 ` Jani Nikula
2021-07-06 18:33 ` Srivatsa, Anusha
1 sibling, 1 reply; 11+ messages in thread
From: Jani Nikula @ 2021-07-05 10:01 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx; +Cc: Lucas De Marchi
On Thu, 01 Jul 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote:
> On the dmc side,we maintain a lookup table with different display
> stepping-substepping combinations.
>
> Instead of adding new table for every new platform, lets ues
> the stepping info from RUNTIME_INFO(dev_priv)->step
>
> v2: Add stepping table for older platforms in intel_step.c (Lucas)
>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dmc.c | 117 +++++++++++++++--------
The changes here...
> drivers/gpu/drm/i915/intel_step.c | 41 ++++++++
> drivers/gpu/drm/i915/intel_step.h | 7 ++
...should be separate from, and depend on, the changes here. Please
don't try to do too much in one patch. Smaller is better.
> 3 files changed, 126 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index f8789d4543bf..df888a3d086e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -247,50 +247,89 @@ bool intel_dmc_has_payload(struct drm_i915_private *i915)
> return i915->dmc.dmc_info[DMC_FW_MAIN].payload;
> }
>
> -static const struct stepping_info skl_stepping_info[] = {
> - {'A', '0'}, {'B', '0'}, {'C', '0'},
> - {'D', '0'}, {'E', '0'}, {'F', '0'},
> - {'G', '0'}, {'H', '0'}, {'I', '0'},
> - {'J', '0'}, {'K', '0'}
> -};
> -
> -static const struct stepping_info bxt_stepping_info[] = {
> - {'A', '0'}, {'A', '1'}, {'A', '2'},
> - {'B', '0'}, {'B', '1'}, {'B', '2'}
> -};
> -
> -static const struct stepping_info icl_stepping_info[] = {
> - {'A', '0'}, {'A', '1'}, {'A', '2'},
> - {'B', '0'}, {'B', '2'},
> - {'C', '0'}
> -};
> -
> static const struct stepping_info no_stepping_info = { '*', '*' };
> +struct stepping_info *display_step;
>
> -static const struct stepping_info *
> +static struct stepping_info *
> intel_get_stepping_info(struct drm_i915_private *dev_priv)
> {
> - const struct stepping_info *si;
> - unsigned int size;
> -
> - if (IS_ICELAKE(dev_priv)) {
> - size = ARRAY_SIZE(icl_stepping_info);
> - si = icl_stepping_info;
> - } else if (IS_SKYLAKE(dev_priv)) {
> - size = ARRAY_SIZE(skl_stepping_info);
> - si = skl_stepping_info;
> - } else if (IS_BROXTON(dev_priv)) {
> - size = ARRAY_SIZE(bxt_stepping_info);
> - si = bxt_stepping_info;
> - } else {
> - size = 0;
> - si = NULL;
> + struct intel_step_info step = RUNTIME_INFO(dev_priv)->step;
> +
> + switch (step.display_step) {
> + case STEP_A0:
> + display_step->stepping = 'A';
> + display_step->substepping = '0';
> + break;
> + case STEP_A1:
> + display_step->stepping = 'A';
> + display_step->substepping = '1';
> + break;
> + case STEP_A2:
> + display_step->stepping = 'A';
> + display_step->substepping = '2';
> + break;
> + case STEP_B0:
> + display_step->stepping = 'B';
> + display_step->substepping = '0';
> + break;
> + case STEP_B1:
> + display_step->stepping = 'B';
> + display_step->substepping = '1';
> + break;
> + case STEP_B2:
> + display_step->stepping = 'B';
> + display_step->substepping = '2';
> + break;
> + case STEP_C0:
> + display_step->stepping = 'C';
> + display_step->substepping = '0';
> + break;
> + case STEP_C1:
> + display_step->stepping = 'C';
> + display_step->substepping = '1';
> + break;
> + case STEP_D0:
> + display_step->stepping = 'D';
> + display_step->substepping = '0';
> + break;
> + case STEP_D1:
> + display_step->stepping = 'D';
> + display_step->substepping = '1';
> + break;
> + case STEP_E0:
> + display_step->stepping = 'E';
> + display_step->substepping = '0';
> + break;
> + case STEP_F0:
> + display_step->stepping = 'F';
> + display_step->substepping = '0';
> + break;
> + case STEP_G0:
> + display_step->stepping = 'G';
> + display_step->substepping = '0';
> + break;
> + case STEP_H0:
> + display_step->stepping = 'H';
> + display_step->substepping = '0';
> + break;
> + case STEP_I0:
> + display_step->stepping = 'I';
> + display_step->substepping = '0';
> + break;
> + case STEP_J0:
> + display_step->stepping = 'J';
> + display_step->substepping = '0';
> + break;
> + case STEP_K0:
> + display_step->stepping = 'K';
> + display_step->substepping = '0';
> + break;
> + default:
> + display_step->stepping = '*';
> + display_step->substepping = '*';
> + break;
> }
> -
> - if (INTEL_REVID(dev_priv) < size)
> - return si + INTEL_REVID(dev_priv);
> -
> - return &no_stepping_info;
> + return display_step;
> }
>
> static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv)
> diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
> index ba9479a67521..c8542161c5d0 100644
> --- a/drivers/gpu/drm/i915/intel_step.c
> +++ b/drivers/gpu/drm/i915/intel_step.c
> @@ -15,6 +15,38 @@
>
>
> /* FIXME: what about REVID_E0 */
So that comment was next to kbl_revids, and this makes it meaningless.
> +static const struct intel_step_info bxt_revid_step_tbl[] = {
Please just call them "bxt_revids" or "bxt_steps" or something simple. I
meant to clean up all the other names too, they're a bit excessive.
> + [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> + [1] = { .gt_step = STEP_A1, .display_step = STEP_A1 },
> + [2] = { .gt_step = STEP_A2, .display_step = STEP_A2 },
> + [6] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> + [7] = { .gt_step = STEP_B1, .display_step = STEP_B1 },
> + [8] = { .gt_step = STEP_B2, .display_step = STEP_B2 },
> +};
We might want to add something like this:
@@ -112,5 +112,8 @@ void intel_step_init(struct drm_i915_private *i915)
if (drm_WARN_ON(&i915->drm, step.gt_step == STEP_NONE))
return;
+ if (step.display_step == STEP_NONE)
+ step.display_step = step.gt_step;
+
RUNTIME_INFO(i915)->step = step;
}
So that we could just initialize .gt_step when the .display_step matches
the .gt_step, and we could avoid the repetition. This wasn't useful for
the platforms currently added, because they actually have the
differences.
This can also be left for future cleanup.
> +
> +
Superfluous newline.
> +static const struct intel_step_info skl_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_C0 },
> + [3] = { .gt_step = STEP_D0, .display_step = STEP_D0 },
> + [4] = { .gt_step = STEP_E0, .display_step = STEP_E0 },
> + [5] = { .gt_step = STEP_F0, .display_step = STEP_F0 },
> + [6] = { .gt_step = STEP_G0, .display_step = STEP_G0 },
> + [7] = { .gt_step = STEP_H0, .display_step = STEP_H0 },
> + [8] = { .gt_step = STEP_I0, .display_step = STEP_I0 },
> + [9] = { .gt_step = STEP_J0, .display_step = STEP_J0 },
skl_stepping_info in intel_dmc.c has K0, this one doesn't.
> +};
> +
> +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 },
icl_stepping_info in intel_dmc.c has A1 and A2, this one doesn't. This
one has C1 and D0, the one in intel_dmc.c doesn't.
> +};
> +
> static const struct intel_step_info kbl_revids[] = {
> [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> [1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> @@ -76,6 +108,15 @@ void intel_step_init(struct drm_i915_private *i915)
> } else if (IS_KABYLAKE(i915)) {
> revids = kbl_revids;
> size = ARRAY_SIZE(kbl_revids);
> + } else if (IS_ICELAKE(i915)) {
> + revids = icl_revid_step_tbl;
> + size = ARRAY_SIZE(icl_revid_step_tbl);
> + } else if (IS_SKYLAKE(i915)) {
> + revids = skl_revid_step_tbl;
> + size = ARRAY_SIZE(skl_revid_step_tbl);
> + } else if (IS_BROXTON(i915)) {
> + revids = bxt_revid_step_tbl;
> + size = ARRAY_SIZE(bxt_revid_step_tbl);
Doing this should be accompanied by:
* Removing *all* ICL_REVID_*, SKL_REVID_* and BXT_REVID_* macros from
i915_drv.h.
* Converting IS_ICL_REVID(), IS_SKL_REVID(), and IS_BXT_REVID() to
IS_{ICL,SKL,KBL}_{GT,DISPLAY}_STEP().
* And making their references use the generic STEP_* macros.
These changes should probably be done on a platform by platform basis,
just in case we hit any issues. This needs to be trivial to bisect and
backtrack as needed.
We currently have two schemes just for transition; we do not want to
have two schemes for a single platform effective at the same time.
BR,
Jani.
> }
>
> /* Not using the stepping scheme for the platform yet. */
> diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h
> index 958a8bb5d677..1bffa41f2660 100644
> --- a/drivers/gpu/drm/i915/intel_step.h
> +++ b/drivers/gpu/drm/i915/intel_step.h
> @@ -22,15 +22,22 @@ struct intel_step_info {
> enum intel_step {
> STEP_NONE = 0,
> STEP_A0,
> + STEP_A1,
> STEP_A2,
> STEP_B0,
> STEP_B1,
> + STEP_B2,
> STEP_C0,
> + STEP_C1,
> STEP_D0,
> STEP_D1,
> STEP_E0,
> STEP_F0,
> STEP_G0,
> + STEP_H0,
> + STEP_I0,
> + STEP_J0,
> + STEP_K0,
> STEP_FUTURE,
> STEP_FOREVER,
> };
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms
2021-07-01 19:31 ` [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms Anusha Srivatsa
@ 2021-07-05 10:05 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-07-05 10:05 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx; +Cc: Lucas De Marchi
On Thu, 01 Jul 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote:
> intel_step.c has stepping_info for most platforms. With DMC using
> display_step from here, lets add the info for all older platforms
> as well
Same here as previous patch. These should be added one platform per
patch, converting the IS_FOO_REVID() macros to
IS_FOO_{GT,DISPLAY}_STEP() and the new stepping info while at it. Look
at the platforms already added. The main point here is being able to
abstract the steppings in intel_step.c so we can use the generic STEP_XY
enums. Having both makes this more complicated.
BR,
Jani.
>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_step.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
> index c8542161c5d0..d8f5ef9ac158 100644
> --- a/drivers/gpu/drm/i915/intel_step.c
> +++ b/drivers/gpu/drm/i915/intel_step.c
> @@ -38,6 +38,13 @@ static const struct intel_step_info skl_revid_step_tbl[] = {
> [9] = { .gt_step = STEP_J0, .display_step = STEP_J0 },
> };
>
> +static const struct intel_step_info glk_revid_step_tbl[] = {
> + [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> + [1] = { .gt_step = STEP_A1, .display_step = STEP_A1 },
> + [2] = { .gt_step = STEP_A2, .display_step = STEP_A2 },
> + [3] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> +};
> +
> 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 },
> @@ -71,6 +78,18 @@ 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 dg1_revid_step_tbl[] = {
> + [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> + [0x1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> +};
> +
> +static const struct intel_step_info rkl_revid_step_tbl[] = {
> + [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> + [0x1] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> + [0x4] = { .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 },
> @@ -99,6 +118,12 @@ 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_DG1(i915)) {
> + revids = dg1_revid_step_tbl;
> + size = ARRAY_SIZE(dg1_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);
> @@ -111,6 +136,9 @@ void intel_step_init(struct drm_i915_private *i915)
> } else if (IS_ICELAKE(i915)) {
> revids = icl_revid_step_tbl;
> size = ARRAY_SIZE(icl_revid_step_tbl);
> + } else if (IS_GEMINILAKE(i915)) {
> + revids = glk_revid_step_tbl;
> + size = ARRAY_SIZE(glk_revid_step_tbl);
> } else if (IS_SKYLAKE(i915)) {
> revids = skl_revid_step_tbl;
> size = ARRAY_SIZE(skl_revid_step_tbl);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step for DMC
2021-07-05 10:01 ` Jani Nikula
@ 2021-07-06 18:33 ` Srivatsa, Anusha
0 siblings, 0 replies; 11+ messages in thread
From: Srivatsa, Anusha @ 2021-07-06 18:33 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: De Marchi, Lucas
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Monday, July 5, 2021 3:01 AM
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: De Marchi, Lucas <lucas.demarchi@intel.com>
> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO-
> >step for DMC
>
> On Thu, 01 Jul 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote:
> > On the dmc side,we maintain a lookup table with different display
> > stepping-substepping combinations.
> >
> > Instead of adding new table for every new platform, lets ues the
> > stepping info from RUNTIME_INFO(dev_priv)->step
> >
> > v2: Add stepping table for older platforms in intel_step.c (Lucas)
> >
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_dmc.c | 117
> > +++++++++++++++--------
>
> The changes here...
>
> > drivers/gpu/drm/i915/intel_step.c | 41 ++++++++
> > drivers/gpu/drm/i915/intel_step.h | 7 ++
>
> ...should be separate from, and depend on, the changes here. Please don't
> try to do too much in one patch. Smaller is better.
>
> > 3 files changed, 126 insertions(+), 39 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> > b/drivers/gpu/drm/i915/display/intel_dmc.c
> > index f8789d4543bf..df888a3d086e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> > @@ -247,50 +247,89 @@ bool intel_dmc_has_payload(struct
> drm_i915_private *i915)
> > return i915->dmc.dmc_info[DMC_FW_MAIN].payload;
> > }
> >
> > -static const struct stepping_info skl_stepping_info[] = {
> > - {'A', '0'}, {'B', '0'}, {'C', '0'},
> > - {'D', '0'}, {'E', '0'}, {'F', '0'},
> > - {'G', '0'}, {'H', '0'}, {'I', '0'},
> > - {'J', '0'}, {'K', '0'}
> > -};
> > -
> > -static const struct stepping_info bxt_stepping_info[] = {
> > - {'A', '0'}, {'A', '1'}, {'A', '2'},
> > - {'B', '0'}, {'B', '1'}, {'B', '2'}
> > -};
> > -
> > -static const struct stepping_info icl_stepping_info[] = {
> > - {'A', '0'}, {'A', '1'}, {'A', '2'},
> > - {'B', '0'}, {'B', '2'},
> > - {'C', '0'}
> > -};
> > -
> > static const struct stepping_info no_stepping_info = { '*', '*' };
> > +struct stepping_info *display_step;
> >
> > -static const struct stepping_info *
> > +static struct stepping_info *
> > intel_get_stepping_info(struct drm_i915_private *dev_priv) {
> > - const struct stepping_info *si;
> > - unsigned int size;
> > -
> > - if (IS_ICELAKE(dev_priv)) {
> > - size = ARRAY_SIZE(icl_stepping_info);
> > - si = icl_stepping_info;
> > - } else if (IS_SKYLAKE(dev_priv)) {
> > - size = ARRAY_SIZE(skl_stepping_info);
> > - si = skl_stepping_info;
> > - } else if (IS_BROXTON(dev_priv)) {
> > - size = ARRAY_SIZE(bxt_stepping_info);
> > - si = bxt_stepping_info;
> > - } else {
> > - size = 0;
> > - si = NULL;
> > + struct intel_step_info step = RUNTIME_INFO(dev_priv)->step;
> > +
> > + switch (step.display_step) {
> > + case STEP_A0:
> > + display_step->stepping = 'A';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_A1:
> > + display_step->stepping = 'A';
> > + display_step->substepping = '1';
> > + break;
> > + case STEP_A2:
> > + display_step->stepping = 'A';
> > + display_step->substepping = '2';
> > + break;
> > + case STEP_B0:
> > + display_step->stepping = 'B';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_B1:
> > + display_step->stepping = 'B';
> > + display_step->substepping = '1';
> > + break;
> > + case STEP_B2:
> > + display_step->stepping = 'B';
> > + display_step->substepping = '2';
> > + break;
> > + case STEP_C0:
> > + display_step->stepping = 'C';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_C1:
> > + display_step->stepping = 'C';
> > + display_step->substepping = '1';
> > + break;
> > + case STEP_D0:
> > + display_step->stepping = 'D';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_D1:
> > + display_step->stepping = 'D';
> > + display_step->substepping = '1';
> > + break;
> > + case STEP_E0:
> > + display_step->stepping = 'E';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_F0:
> > + display_step->stepping = 'F';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_G0:
> > + display_step->stepping = 'G';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_H0:
> > + display_step->stepping = 'H';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_I0:
> > + display_step->stepping = 'I';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_J0:
> > + display_step->stepping = 'J';
> > + display_step->substepping = '0';
> > + break;
> > + case STEP_K0:
> > + display_step->stepping = 'K';
> > + display_step->substepping = '0';
> > + break;
> > + default:
> > + display_step->stepping = '*';
> > + display_step->substepping = '*';
> > + break;
> > }
> > -
> > - if (INTEL_REVID(dev_priv) < size)
> > - return si + INTEL_REVID(dev_priv);
> > -
> > - return &no_stepping_info;
> > + return display_step;
> > }
> >
> > static void gen9_set_dc_state_debugmask(struct drm_i915_private
> > *dev_priv) diff --git a/drivers/gpu/drm/i915/intel_step.c
> > b/drivers/gpu/drm/i915/intel_step.c
> > index ba9479a67521..c8542161c5d0 100644
> > --- a/drivers/gpu/drm/i915/intel_step.c
> > +++ b/drivers/gpu/drm/i915/intel_step.c
> > @@ -15,6 +15,38 @@
> >
> >
> > /* FIXME: what about REVID_E0 */
>
> So that comment was next to kbl_revids, and this makes it meaningless.
>
> > +static const struct intel_step_info bxt_revid_step_tbl[] = {
>
> Please just call them "bxt_revids" or "bxt_steps" or something simple. I
> meant to clean up all the other names too, they're a bit excessive.
>
I ll send the patch to change the names.
> > + [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> > + [1] = { .gt_step = STEP_A1, .display_step = STEP_A1 },
> > + [2] = { .gt_step = STEP_A2, .display_step = STEP_A2 },
> > + [6] = { .gt_step = STEP_B0, .display_step = STEP_B0 },
> > + [7] = { .gt_step = STEP_B1, .display_step = STEP_B1 },
> > + [8] = { .gt_step = STEP_B2, .display_step = STEP_B2 }, };
>
> We might want to add something like this:
>
> @@ -112,5 +112,8 @@ void intel_step_init(struct drm_i915_private *i915)
> if (drm_WARN_ON(&i915->drm, step.gt_step == STEP_NONE))
> return;
>
> + if (step.display_step == STEP_NONE)
> + step.display_step = step.gt_step;
> +
> RUNTIME_INFO(i915)->step = step;
> }
>
> So that we could just initialize .gt_step when the .display_step matches the
> .gt_step, and we could avoid the repetition. This wasn't useful for the
> platforms currently added, because they actually have the differences.
>
> This can also be left for future cleanup.
Makes sense. I ll be changing this now. Thanks for feedback.
> > +
> > +
>
> Superfluous newline.
>
> > +static const struct intel_step_info skl_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_C0 },
> > + [3] = { .gt_step = STEP_D0, .display_step = STEP_D0 },
> > + [4] = { .gt_step = STEP_E0, .display_step = STEP_E0 },
> > + [5] = { .gt_step = STEP_F0, .display_step = STEP_F0 },
> > + [6] = { .gt_step = STEP_G0, .display_step = STEP_G0 },
> > + [7] = { .gt_step = STEP_H0, .display_step = STEP_H0 },
> > + [8] = { .gt_step = STEP_I0, .display_step = STEP_I0 },
> > + [9] = { .gt_step = STEP_J0, .display_step = STEP_J0 },
>
> skl_stepping_info in intel_dmc.c has K0, this one doesn't.
>
> > +};
> > +
> > +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 },
>
> icl_stepping_info in intel_dmc.c has A1 and A2, this one doesn't. This one has
> C1 and D0, the one in intel_dmc.c doesn't.
>
> > +};
> > +
> > static const struct intel_step_info kbl_revids[] = {
> > [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 },
> > [1] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, @@ -76,6
> > +108,15 @@ void intel_step_init(struct drm_i915_private *i915)
> > } else if (IS_KABYLAKE(i915)) {
> > revids = kbl_revids;
> > size = ARRAY_SIZE(kbl_revids);
> > + } else if (IS_ICELAKE(i915)) {
> > + revids = icl_revid_step_tbl;
> > + size = ARRAY_SIZE(icl_revid_step_tbl);
> > + } else if (IS_SKYLAKE(i915)) {
> > + revids = skl_revid_step_tbl;
> > + size = ARRAY_SIZE(skl_revid_step_tbl);
> > + } else if (IS_BROXTON(i915)) {
> > + revids = bxt_revid_step_tbl;
> > + size = ARRAY_SIZE(bxt_revid_step_tbl);
>
> Doing this should be accompanied by:
>
> * Removing *all* ICL_REVID_*, SKL_REVID_* and BXT_REVID_* macros from
> i915_drv.h.
>
> * Converting IS_ICL_REVID(), IS_SKL_REVID(), and IS_BXT_REVID() to
> IS_{ICL,SKL,KBL}_{GT,DISPLAY}_STEP().
>
> * And making their references use the generic STEP_* macros.
>
> These changes should probably be done on a platform by platform basis, just
> in case we hit any issues. This needs to be trivial to bisect and backtrack as
> needed.
>
> We currently have two schemes just for transition; we do not want to have
> two schemes for a single platform effective at the same time.
>
Thanks for feedback. Taking care of these changes.
Anusha
> BR,
> Jani.
>
> > }
> >
> > /* Not using the stepping scheme for the platform yet. */ diff --git
> > a/drivers/gpu/drm/i915/intel_step.h
> > b/drivers/gpu/drm/i915/intel_step.h
> > index 958a8bb5d677..1bffa41f2660 100644
> > --- a/drivers/gpu/drm/i915/intel_step.h
> > +++ b/drivers/gpu/drm/i915/intel_step.h
> > @@ -22,15 +22,22 @@ struct intel_step_info { enum intel_step {
> > STEP_NONE = 0,
> > STEP_A0,
> > + STEP_A1,
> > STEP_A2,
> > STEP_B0,
> > STEP_B1,
> > + STEP_B2,
> > STEP_C0,
> > + STEP_C1,
> > STEP_D0,
> > STEP_D1,
> > STEP_E0,
> > STEP_F0,
> > STEP_G0,
> > + STEP_H0,
> > + STEP_I0,
> > + STEP_J0,
> > + STEP_K0,
> > STEP_FUTURE,
> > STEP_FOREVER,
> > };
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-07-06 18:34 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-01 19:31 [Intel-gfx] [PATCH 0/2] Stepping/substepping reorg for DMC Anusha Srivatsa
2021-07-01 19:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/dmc: Use RUNTIME_INFO->step " Anusha Srivatsa
2021-07-02 8:56 ` kernel test robot
2021-07-02 8:56 ` kernel test robot
2021-07-05 10:01 ` Jani Nikula
2021-07-06 18:33 ` Srivatsa, Anusha
2021-07-01 19:31 ` [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Add steping info table for remaining platforms Anusha Srivatsa
2021-07-05 10:05 ` Jani Nikula
2021-07-02 0:48 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Stepping/substepping reorg for DMC Patchwork
2021-07-02 0:50 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-07-02 1:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.