Skip to contentSkip to conversation

drm/i915/cnl: Add support slice/subslice/eu configs

PATCH In review Rodrigo Vivi 4 participants 5 messages Aug 31, 2017 – Sep 5, 2017

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 drm/i915/cnl: Add support slice/subslice/eu configs

From: Ben Widawsky <[email protected]>

Cannonlake Slice and Subslice information has changed. This Patch provided by Ben adds the proper sseu initialization.

v2: This v2 done by Rodrigo includes:
- Fix on Total slices count by avoiding [1][2] and [2][2].
- Inclusion of EU Per Subslice.
- Commit message.

---
 drivers/gpu/drm/i915/i915_drv.h          |  5 +++-
 drivers/gpu/drm/i915/i915_reg.h          | 20 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c | 50 +++++++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -1
index 0383e879a315..2fdd59e85189 100644
@@ -786,7 +786,10 @@ struct sseu_dev_info {
 	u8 slice_mask;
 	u8 subslice_mask;
 	u8 eu_total;
-	u8 eu_per_subslice;
+	union {
+		u8 per_subslice_eu_disable_mask[3][3];
+		u8 eu_per_subslice;
+	};
 	u8 min_eu_in_pool;
 	/* For each slice, which subslice(s) has(have) 7 EUs (bitfield)? */
 	u8 subslice_7eu[3];
drivers/gpu/drm/i915/i915_reg.h +20 -0
index 5651081ff789..7f71007baa94 100644
@@ -2730,6 +2730,11 @@ enum i915_power_well_id {
 #define   GEN9_F2_SS_DIS_SHIFT		20
 #define   GEN9_F2_SS_DIS_MASK		(0xf << GEN9_F2_SS_DIS_SHIFT)
 
+#define   GEN10_F2_S_ENA_SHIFT		22
+#define   GEN10_F2_S_ENA_MASK		(0x7 << GEN10_F2_S_ENA_SHIFT)
+#define   GEN10_F2_SS_DIS_SHIFT		18
+#define   GEN10_F2_SS_DIS_MASK		(0x7 << GEN10_F2_SS_DIS_SHIFT)
+
 #define GEN8_EU_DISABLE0		_MMIO(0x9134)
 #define   GEN8_EU_DIS0_S0_MASK		0xffffff
 #define   GEN8_EU_DIS0_S1_SHIFT		24
@@ -2745,6 +2750,21 @@ enum i915_power_well_id {
 
 #define GEN9_EU_DISABLE(slice)		_MMIO(0x9134 + (slice)*0x4)
 
+#define GEN10_EU_DIS0_S0_SHIFT		0
+#define GEN10_EU_DIS0_S0_MASK		(0xff << GEN10_EU_DIS0_S0_SHIFT)
+#define GEN10_EU_DIS0_S1_SHIFT		8
+#define GEN10_EU_DIS0_S1_MASK		(0xff << GEN10_EU_DIS0_S1_SHIFT)
+#define GEN10_EU_DIS0_S2_SHIFT		16
+#define GEN10_EU_DIS0_S2_MASK		(0xff << GEN10_EU_DIS0_S2_SHIFT)
+#define GEN10_EU_DIS1_S0_SHIFT		24
+#define GEN10_EU_DIS1_S0_MASK		(0xff << GEN10_EU_DIS1_S0_SHIFT)
+#define GEN10_EU_DIS1_S1_SHIFT		0
+#define GEN10_EU_DIS1_S1_MASK		(0xff << GEN10_EU_DIS1_S1_SHIFT)
+#define GEN10_EU_DIS2_S0_SHIFT		8
+#define GEN10_EU_DIS2_S0_MASK		(0xff << GEN10_EU_DIS2_S0_SHIFT)
+#define GEN10_EU_DIS2_S1_SHIFT		16
+#define GEN10_EU_DIS2_S1_MASK		(0xff << GEN10_EU_DIS2_S1_SHIFT)
+
 #define GEN6_BSD_SLEEP_PSMI_CONTROL	_MMIO(0x12050)
 #define   GEN6_BSD_SLEEP_MSG_DISABLE	(1 << 0)
 #define   GEN6_BSD_SLEEP_FLUSH_DISABLE	(1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +49 -1

63 lines not on this page · raw message

Signature · 6 lines
2.13.2

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

quick extra note on this:
with this the SSEU Device Info is right and matching spec.. But SSEU Device Status needs a rework that I will do in a follow-up patch:

CNL-Y (2x8):

SSEU Device Info
Available Slice Mask: 0001
Available Slice Total: 1
Available Subslice Total: 2
Available Subslice Mask: 0006
Available Subslice Per Slice: 2
Available EU Total: 16
Available EU Per Subslice: 8
Has Pooled EU: no
Has Slice Power Gating: yes
Has Subslice Power Gating: yes
Has EU Power Gating: yes
SSEU Device Status
Enabled Slice Mask: 0001
Enabled Slice Total: 1
Enabled Subslice Total: 2
Enabled Subslice Mask: 0006
Enabled Subslice Per Slice: 2
Enabled EU Total: 20
Enabled EU Per Subslice: 8

Quoted 150 lines · Rodrigo Vivi

From: Ben Widawsky <[email protected]>

Cannonlake Slice and Subslice information has changed. This Patch provided by Ben adds the proper sseu initialization.

v2: This v2 done by Rodrigo includes:
- Fix on Total slices count by avoiding [1][2] and [2][2].
- Inclusion of EU Per Subslice.
- Commit message.

---
 drivers/gpu/drm/i915/i915_drv.h          |  5 +++-
 drivers/gpu/drm/i915/i915_reg.h          | 20 +++++++++++++
 drivers/gpu/drm/i915/intel_device_info.c | 50 +++++++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -1
index 0383e879a315..2fdd59e85189 100644
@@ -786,7 +786,10 @@ struct sseu_dev_info {
        u8 slice_mask;
        u8 subslice_mask;
        u8 eu_total;
-       u8 eu_per_subslice;
+       union {
+               u8 per_subslice_eu_disable_mask[3][3];
+               u8 eu_per_subslice;
+       };
        u8 min_eu_in_pool;
        /* For each slice, which subslice(s) has(have) 7 EUs (bitfield)? */
        u8 subslice_7eu[3];
drivers/gpu/drm/i915/i915_reg.h +20 -0
index 5651081ff789..7f71007baa94 100644
@@ -2730,6 +2730,11 @@ enum i915_power_well_id {
 #define   GEN9_F2_SS_DIS_SHIFT         20
 #define   GEN9_F2_SS_DIS_MASK          (0xf << GEN9_F2_SS_DIS_SHIFT)
 
+#define   GEN10_F2_S_ENA_SHIFT         22
+#define   GEN10_F2_S_ENA_MASK          (0x7 << GEN10_F2_S_ENA_SHIFT)
+#define   GEN10_F2_SS_DIS_SHIFT                18
+#define   GEN10_F2_SS_DIS_MASK         (0x7 << GEN10_F2_SS_DIS_SHIFT)
+
 #define GEN8_EU_DISABLE0               _MMIO(0x9134)
 #define   GEN8_EU_DIS0_S0_MASK         0xffffff
 #define   GEN8_EU_DIS0_S1_SHIFT                24
@@ -2745,6 +2750,21 @@ enum i915_power_well_id {
 
 #define GEN9_EU_DISABLE(slice)         _MMIO(0x9134 + (slice)*0x4)
 
+#define GEN10_EU_DIS0_S0_SHIFT         0
+#define GEN10_EU_DIS0_S0_MASK          (0xff << GEN10_EU_DIS0_S0_SHIFT)
+#define GEN10_EU_DIS0_S1_SHIFT         8
+#define GEN10_EU_DIS0_S1_MASK          (0xff << GEN10_EU_DIS0_S1_SHIFT)
+#define GEN10_EU_DIS0_S2_SHIFT         16
+#define GEN10_EU_DIS0_S2_MASK          (0xff << GEN10_EU_DIS0_S2_SHIFT)
+#define GEN10_EU_DIS1_S0_SHIFT         24
+#define GEN10_EU_DIS1_S0_MASK          (0xff << GEN10_EU_DIS1_S0_SHIFT)
+#define GEN10_EU_DIS1_S1_SHIFT         0
+#define GEN10_EU_DIS1_S1_MASK          (0xff << GEN10_EU_DIS1_S1_SHIFT)
+#define GEN10_EU_DIS2_S0_SHIFT         8
+#define GEN10_EU_DIS2_S0_MASK          (0xff << GEN10_EU_DIS2_S0_SHIFT)
+#define GEN10_EU_DIS2_S1_SHIFT         16
+#define GEN10_EU_DIS2_S1_MASK          (0xff << GEN10_EU_DIS2_S1_SHIFT)
+
 #define GEN6_BSD_SLEEP_PSMI_CONTROL    _MMIO(0x12050)
 #define   GEN6_BSD_SLEEP_MSG_DISABLE   (1 << 0)
 #define   GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +49 -2
index 5f91ddc78c7a..da13becf97f1 100644
@@ -82,6 +82,52 @@ void intel_device_info_dump(struct drm_i915_private *dev_priv)
 #undef PRINT_FLAG
 }
 
+static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)
+{
+       struct sseu_dev_info *sseu = &mkwrite_device_info(dev_priv)->sseu;
+       const u32 fuse2 = I915_READ(GEN8_FUSE2);
+       u32 temp, i, j;
+
+       sseu->slice_mask = (fuse2 & GEN10_F2_S_ENA_MASK) >> GEN10_F2_S_ENA_SHIFT;
+       sseu->subslice_mask = (1 << 3) - 1;
+       sseu->subslice_mask &= ~((fuse2 & GEN10_F2_SS_DIS_MASK) >>
+                                GEN10_F2_SS_DIS_SHIFT);
+
+       temp = I915_READ(GEN8_EU_DISABLE0);
+       sseu->per_subslice_eu_disable_mask[0][0] =
+               (temp & GEN10_EU_DIS0_S0_MASK) >> GEN10_EU_DIS0_S0_SHIFT;
+       sseu->per_subslice_eu_disable_mask[0][1] =
+               (temp & GEN10_EU_DIS0_S1_MASK) >> GEN10_EU_DIS0_S1_SHIFT;
+       sseu->per_subslice_eu_disable_mask[0][2] =
+               (temp & GEN10_EU_DIS0_S2_MASK) >> GEN10_EU_DIS0_S2_SHIFT;
+       sseu->per_subslice_eu_disable_mask[1][0] =
+               (temp & GEN10_EU_DIS1_S0_MASK) >> GEN10_EU_DIS1_S0_SHIFT;
+
+       temp = I915_READ(GEN8_EU_DISABLE1);
+       sseu->per_subslice_eu_disable_mask[1][1] =
+               (temp & GEN10_EU_DIS1_S1_MASK) >> GEN10_EU_DIS1_S1_SHIFT;
+       sseu->per_subslice_eu_disable_mask[2][0] =
+               (temp & GEN10_EU_DIS2_S0_MASK) >> GEN10_EU_DIS2_S0_SHIFT;
+       sseu->per_subslice_eu_disable_mask[2][1] =
+               (temp & GEN10_EU_DIS2_S1_MASK) >> GEN10_EU_DIS2_S1_SHIFT;
+
+       for (i = 0; i < 3; i++)
+               for (j = 0; j < (i == 0 ? 3 : 2); j++)
+                       sseu->eu_total +=
+                               hweight8(~sseu->per_subslice_eu_disable_mask[i][j]);
+
+       /* Let's assume uniform distribution */
+       sseu->eu_per_subslice = sseu_subslice_total(sseu) ?
+                               DIV_ROUND_UP(sseu->eu_total,
+                                            sseu_subslice_total(sseu)) : 0;
+
+       /* No restrictions on Power Gating */
+       sseu->has_slice_pg = 1;
+       sseu->has_subslice_pg = 1;
+       sseu->has_eu_pg = 1;
+}
+
+
 static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv)
 {
        struct sseu_dev_info *sseu = &mkwrite_device_info(dev_priv)->sseu;
@@ -409,8 +455,10 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
                cherryview_sseu_info_init(dev_priv);
        else if (IS_BROADWELL(dev_priv))
                broadwell_sseu_info_init(dev_priv);
-       else if (INTEL_INFO(dev_priv)->gen >= 9)
+       else if (INTEL_INFO(dev_priv)->gen == 9)
                gen9_sseu_info_init(dev_priv);
+       else if (INTEL_INFO(dev_priv)->gen >= 10)
+               gen10_sseu_info_init(dev_priv);
 
        info->has_snoop = !info->has_llc;
 
--

2.13.2

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

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

✓ Fi.CI.BAT: success for drm/i915/cnl: Add support slice/subslice/eu configs

In reply to Rodrigo Vivi
== Series Details ==

== Series Details ==

Series: drm/i915/cnl: Add support slice/subslice/eu configs
URL : https://patchwork.freedesktop.org/series/29644/
State : success

== Summary ==

Series 29644v1 drm/i915/cnl: Add support slice/subslice/eu configs
https://patchwork.freedesktop.org/api/1.0/series/29644/revisions/1/mbox/

Test kms_cursor_legacy:

        Subgroup basic-busy-flip-before-cursor-atomic:
                pass       -> FAIL       (fi-snb-2600) fdo#100215 +1
        Subgroup basic-flip-after-cursor-varying-size:
                fail       -> PASS       (fi-hsw-4770) fdo#102402 +1

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

fi-bdw-5557u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:455s
fi-bdw-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:443s
fi-blb-e6850     total:288  pass:224  dwarn:1   dfail:0   fail:0   skip:63  time:359s
fi-bsw-n3050     total:288  pass:243  dwarn:0   dfail:0   fail:0   skip:45  time:564s
fi-bwr-2160      total:288  pass:184  dwarn:0   dfail:0   fail:0   skip:104 time:254s
fi-bxt-j4205     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:521s
fi-byt-j1900     total:288  pass:254  dwarn:1   dfail:0   fail:0   skip:33  time:525s
fi-byt-n2820     total:288  pass:250  dwarn:1   dfail:0   fail:0   skip:37  time:518s
fi-elk-e7500     total:288  pass:230  dwarn:0   dfail:0   fail:0   skip:58  time:438s
fi-glk-2a        total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:614s
fi-hsw-4770      total:288  pass:263  dwarn:0   dfail:0   fail:0   skip:25  time:455s
fi-hsw-4770r     total:288  pass:263  dwarn:0   dfail:0   fail:0   skip:25  time:423s
fi-ilk-650       total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:425s
fi-ivb-3520m     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:498s
fi-ivb-3770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:476s
fi-kbl-7500u     total:288  pass:264  dwarn:1   dfail:0   fail:0   skip:23  time:514s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:597s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:596s
fi-pnv-d510      total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:520s
fi-skl-6260u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:470s
fi-skl-6700k     total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:537s
fi-skl-6770hq    total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:487s
fi-skl-gvtdvm    total:288  pass:266  dwarn:0   dfail:0   fail:0   skip:22  time:441s
fi-skl-x1585l    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-snb-2520m     total:288  pass:251  dwarn:0   dfail:0   fail:0   skip:37  time:556s
fi-snb-2600      total:288  pass:249  dwarn:0   dfail:0   fail:1   skip:38  time:407s

ccf4ca2d93383fe1a234aba83df9c21400216433 drm-tip: 2017y-08m-31d-18h-37m-46s UTC integration manifest 668e5b837d83 drm/i915/cnl: Add support slice/subslice/eu configs

== Logs ==

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

#3 lore raw

✓ Fi.CI.IGT: success for drm/i915/cnl: Add support slice/subslice/eu configs

In reply to Rodrigo Vivi
== Series Details ==

== Series Details ==

Series: drm/i915/cnl: Add support slice/subslice/eu configs
URL : https://patchwork.freedesktop.org/series/29644/
State : success

== Summary ==

shard-hsw total:2265 pass:1232 dwarn:0 dfail:0 fail:17 skip:1016 time:9591s

== Logs ==

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

#4 lore raw
In reply to Rodrigo Vivi
Quoted 41 lines · Rodrigo Vivi

From: Ben Widawsky <[email protected]>

Cannonlake Slice and Subslice information has changed. This Patch provided by Ben adds the proper sseu initialization.

v2: This v2 done by Rodrigo includes:
- Fix on Total slices count by avoiding [1][2] and [2][2].
- Inclusion of EU Per Subslice.
- Commit message.

---
  drivers/gpu/drm/i915/i915_drv.h          |  5 +++-
  drivers/gpu/drm/i915/i915_reg.h          | 20 +++++++++++++
  drivers/gpu/drm/i915/intel_device_info.c | 50 +++++++++++++++++++++++++++++++-
  3 files changed, 73 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -1
index 0383e879a315..2fdd59e85189 100644
@@ -786,7 +786,10 @@ struct sseu_dev_info {
  	u8 slice_mask;
  	u8 subslice_mask;
  	u8 eu_total;
-	u8 eu_per_subslice;
+	union {
+		u8 per_subslice_eu_disable_mask[3][3];
+		u8 eu_per_subslice;
+	};
  	u8 min_eu_in_pool;
  	/* For each slice, which subslice(s) has(have) 7 EUs (bitfield)? */
  	u8 subslice_7eu[3];
drivers/gpu/drm/i915/i915_reg.h +0 -0
index 5651081ff789..7f71007baa94 100644

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

Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -2730,6 +2730,11 @@ enum i915_power_well_id {
  #define   GEN9_F2_SS_DIS_SHIFT		20
  #define   GEN9_F2_SS_DIS_MASK		(0xf << GEN9_F2_SS_DIS_SHIFT)
 
+#define   GEN10_F2_S_ENA_SHIFT		22
+#define   GEN10_F2_S_ENA_MASK		(0x7 << GEN10_F2_S_ENA_SHIFT)
+#define   GEN10_F2_SS_DIS_SHIFT		18
+#define   GEN10_F2_SS_DIS_MASK		(0x7 << GEN10_F2_SS_DIS_SHIFT)
+

Technically, the BSpec allows 6 bits for slice_enable (of which only 4 are used) and 4 bits for subslice_disable, instead of 3 and 3, right? Even if some variants are not productized, isn't it better to cover our back and read the fuses completely?

Quoted 12 lines
drivers/gpu/drm/i915/i915_reg.h +5 -0
  #define GEN8_EU_DISABLE0		_MMIO(0x9134)
  #define   GEN8_EU_DIS0_S0_MASK		0xffffff
  #define   GEN8_EU_DIS0_S1_SHIFT		24
@@ -2745,6 +2750,21 @@ enum i915_power_well_id {
 
  #define GEN9_EU_DISABLE(slice)		_MMIO(0x9134 + (slice)*0x4)
 
+#define GEN10_EU_DIS0_S0_SHIFT		0
+#define GEN10_EU_DIS0_S0_MASK		(0xff << GEN10_EU_DIS0_S0_SHIFT)
+#define GEN10_EU_DIS0_S1_SHIFT		8
+#define GEN10_EU_DIS0_S1_MASK		(0xff << GEN10_EU_DIS0_S1_SHIFT)
+#define GEN10_EU_DIS0_S2_SHIFT		16

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

Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +10 -0
+#define GEN10_EU_DIS0_S2_MASK		(0xff << GEN10_EU_DIS0_S2_SHIFT)
+#define GEN10_EU_DIS1_S0_SHIFT		24
+#define GEN10_EU_DIS1_S0_MASK		(0xff << GEN10_EU_DIS1_S0_SHIFT)
+#define GEN10_EU_DIS1_S1_SHIFT		0
+#define GEN10_EU_DIS1_S1_MASK		(0xff << GEN10_EU_DIS1_S1_SHIFT)
+#define GEN10_EU_DIS2_S0_SHIFT		8
+#define GEN10_EU_DIS2_S0_MASK		(0xff << GEN10_EU_DIS2_S0_SHIFT)
+#define GEN10_EU_DIS2_S1_SHIFT		16
+#define GEN10_EU_DIS2_S1_MASK		(0xff << GEN10_EU_DIS2_S1_SHIFT)
+

I suggest a naming like:

GEN10_EU_DIS_Sm_SSn_SHIFT

where n is the slice number and m the subslice number

Also, related to my previous comment, there should be a:

#define GEN10_EU_DIS3_S0_SHIFT 24
#define GEN10_EU_DIS3_S0_MASK (0xff << GEN10_EU_DIS3_S0_SHIFT)

Quoted 11 lines
drivers/gpu/drm/i915/i915_reg.h +0 -0
  #define GEN6_BSD_SLEEP_PSMI_CONTROL	_MMIO(0x12050)
  #define   GEN6_BSD_SLEEP_MSG_DISABLE	(1 << 0)
  #define   GEN6_BSD_SLEEP_FLUSH_DISABLE	(1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +0 -0
index 5f91ddc78c7a..da13becf97f1 100644
@@ -82,6 +82,52 @@ void intel_device_info_dump(struct drm_i915_private *dev_priv)
  #undef PRINT_FLAG
  }
 

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_dump(struct drm_i915_private *dev_priv) · line 94

Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10 -0
+static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)
+{
+	struct sseu_dev_info *sseu = &mkwrite_device_info(dev_priv)->sseu;
+	const u32 fuse2 = I915_READ(GEN8_FUSE2);
+	u32 temp, i, j;
+
+	sseu->slice_mask = (fuse2 & GEN10_F2_S_ENA_MASK) >> GEN10_F2_S_ENA_SHIFT;
+	sseu->subslice_mask = (1 << 3) - 1;
+	sseu->subslice_mask &= ~((fuse2 & GEN10_F2_SS_DIS_MASK) >>
+				 GEN10_F2_SS_DIS_SHIFT);

See my comments above about slice_enable and subslice_disable masks.

Quoted 12 lines
drivers/gpu/drm/i915/intel_device_info.c +12 -0
+	temp = I915_READ(GEN8_EU_DISABLE0);
+	sseu->per_subslice_eu_disable_mask[0][0] =
+		(temp & GEN10_EU_DIS0_S0_MASK) >> GEN10_EU_DIS0_S0_SHIFT;
+	sseu->per_subslice_eu_disable_mask[0][1] =
+		(temp & GEN10_EU_DIS0_S1_MASK) >> GEN10_EU_DIS0_S1_SHIFT;
+	sseu->per_subslice_eu_disable_mask[0][2] =
+		(temp & GEN10_EU_DIS0_S2_MASK) >> GEN10_EU_DIS0_S2_SHIFT;
+	sseu->per_subslice_eu_disable_mask[1][0] =
+		(temp & GEN10_EU_DIS1_S0_MASK) >> GEN10_EU_DIS1_S0_SHIFT;
+
+	temp = I915_READ(GEN8_EU_DISABLE1);
+	sseu->per_subslice_eu_disable_mask[1][1] =

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_dump(struct drm_i915_private *dev_priv) · line 117

Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10 -0
+		(temp & GEN10_EU_DIS1_S1_MASK) >> GEN10_EU_DIS1_S1_SHIFT;
+	sseu->per_subslice_eu_disable_mask[2][0] =
+		(temp & GEN10_EU_DIS2_S0_MASK) >> GEN10_EU_DIS2_S0_SHIFT;
+	sseu->per_subslice_eu_disable_mask[2][1] =
+		(temp & GEN10_EU_DIS2_S1_MASK) >> GEN10_EU_DIS2_S1_SHIFT;
+
+	for (i = 0; i < 3; i++)
+		for (j = 0; j < (i == 0 ? 3 : 2); j++)
+			sseu->eu_total +=
+				hweight8(~sseu->per_subslice_eu_disable_mask[i][j]);

Same thing as before.
Also: don't we want to read all of this back in debugfs (i915_sseu_status)? (although maybe there is a separate patch for this that I have missed)

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_dump(struct drm_i915_private *dev_priv) · line 122

Quoted 4 lines
drivers/gpu/drm/i915/intel_device_info.c +4 -0
+	/* Let's assume uniform distribution */
+	sseu->eu_per_subslice = sseu_subslice_total(sseu) ?
+				DIV_ROUND_UP(sseu->eu_total,
+					     sseu_subslice_total(sseu)) : 0;

Can we add a comment similar to the one for Gen9?:

/*
* CNL is expected to always have a uniform distribution
* of EU across subslices with the exception that any one
* EU in any one subslice may be fused off for die
* recovery.
*/

Quoted 11 lines
drivers/gpu/drm/i915/intel_device_info.c +7 -0
+	/* No restrictions on Power Gating */
+	sseu->has_slice_pg = 1;
+	sseu->has_subslice_pg = 1;
+	sseu->has_eu_pg = 1;
+}
+
+
  static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv)
  {
  	struct sseu_dev_info *sseu = &mkwrite_device_info(dev_priv)->sseu;

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) · line 461

Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c +3 -1
@@ -409,8 +455,10 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
  		cherryview_sseu_info_init(dev_priv);
  	else if (IS_BROADWELL(dev_priv))
  		broadwell_sseu_info_init(dev_priv);
-	else if (INTEL_INFO(dev_priv)->gen >= 9)
+	else if (INTEL_INFO(dev_priv)->gen == 9)
  		gen9_sseu_info_init(dev_priv);
+	else if (INTEL_INFO(dev_priv)->gen >= 10)
+		gen10_sseu_info_init(dev_priv);

Maybe leverage this change to move to INTEL_GEN(dev_priv)?

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) · line 464

Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.c +0 -0
  	info->has_snoop = !info->has_llc;
 

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