Refactor to expand subslice mask (rev 2)
Subsystems (2)
cover Refactor to expand subslice mask (rev 2)
Currently, the subslice_mask runtime parameter is stored as an array of subslices per slice. Expand the subslice mask array to better match what is presented to userspace through the I915_QUERY_TOPOLOGY_INFO ioctl. The index into this array is then calculated:
slice * subslice stride + subslice index / 8
Note this is the second iteration of an original patch to implement the same. There are a couple of minor code changes based on changes since the first series was posted. Additionally, the original patch has been split into several smaller patches with more isolated changes based on review feedback in that first series.
Link to the original series:
https://patchwork.freedesktop.org/series/59742/
v2: Fix 32-bit build
v3: Fix typo in haswell sseu info routine and fix SSEU workaround
print
v4: Merge patch to HSW in previous revision with patch to
set subslice_mask for each platform and address feedback from Chris
v5: No changes in code. Resending due to unrelated failures - confirmed
no failures with trybot.
v6: Minor change in intel_workarounds.c to use the new helper function
v7: Split set sublice function into multiple more manageable patches
And add a couple of GEM_BUG_ON checks requested by Chris
Stuart Summers (11):
drm/i915: Use variable for debugfs device status drm/i915: Add function to set SSEU info per platform drm/i915: Add subslice stride runtime parameter drm/i915: Add EU stride runtime parameter
drm/i915: Use local variables for subslice_mask for device info drm/i915: Add function to set subslices
drm/i915: Use subslice stride to set subslices for a given slice drm/i915: Add function to determine if a slice has a subslice drm/i915: Refactor instdone loops on new subslice functions drm/i915: Add new function to copy subslices for a slice drm/i915: Expand subslice mask
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 31 +++-- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 52 +++++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 30 ++++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 +- drivers/gpu/drm/i915/i915_debugfs.c | 49 +++++--- drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- drivers/gpu/drm/i915/i915_query.c | 10 +- drivers/gpu/drm/i915/intel_device_info.c | 122 +++++++++---------- 10 files changed, 196 insertions(+), 114 deletions(-)
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/11 drm/i915: Use variable for debugfs device status
Use a local variable to find SSEU runtime information in various debugfs functions.
v2: Remove extra line breaks per feedback from Chris
--- drivers/gpu/drm/i915/i915_debugfs.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +11 -15
@@ -3844,8 +3844,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, sseu->slice_mask |=BIT (s);if (IS_GEN9_BC (dev_priv)) - sseu->subslice_mask[s] = -RUNTIME_INFO (dev_priv)->sseu.subslice_mask[s]; + sseu->subslice_mask[s] = info->sseu.subslice_mask[s];for (ss =0 ; ss < info->sseu.max_subslices; ss++) {unsigned int eu_cnt;
@@ -3872,25 +3871,22 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,static void broadwell_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_info *sseu) { +const struct intel_runtime_info *info =RUNTIME_INFO (dev_priv);u32 slice_info =I915_READ (GEN8_GT_SLICE_INFO );int s; sseu->slice_mask = slice_info &GEN8_LSLICESTAT_MASK ;if (sseu->slice_mask) { - sseu->eu_per_subslice = -RUNTIME_INFO (dev_priv)->sseu.eu_per_subslice; -for (s =0 ; s <fls (sseu->slice_mask); s++) { - sseu->subslice_mask[s] = -RUNTIME_INFO (dev_priv)->sseu.subslice_mask[s]; - } + sseu->eu_per_subslice = info->sseu.eu_per_subslice; +for (s =0 ; s <fls (sseu->slice_mask); s++) + sseu->subslice_mask[s] = info->sseu.subslice_mask[s]; sseu->eu_total = sseu->eu_per_subslice *intel_sseu_subslice_total (sseu);/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s <fls (sseu->slice_mask); s++) { -u8 subslice_7eu = -RUNTIME_INFO (dev_priv)->sseu.subslice_7eu[s]; +u8 subslice_7eu = info->sseu.subslice_7eu[s]; sseu->eu_total -=hweight8 (subslice_7eu); }
@@ -3937,6 +3933,7 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info,static int i915_sseu_status (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); +const struct intel_runtime_info *info =RUNTIME_INFO (dev_priv);struct sseu_dev_info sseu;intel_wakeref_t wakeref;
@@ -3944,14 +3941,13 @@ static int i915_sseu_status(struct seq_file *m, void *unused)return -ENODEV ;seq_puts (m,"SSEU Device Info\n" ); -i915_print_sseu_info (m, true, &RUNTIME_INFO (dev_priv)->sseu); +i915_print_sseu_info (m, true, &info->sseu);seq_puts (m,"SSEU Device Status\n" );memset (&sseu,0 ,sizeof (sseu)); - sseu.max_slices =RUNTIME_INFO (dev_priv)->sseu.max_slices; - sseu.max_subslices =RUNTIME_INFO (dev_priv)->sseu.max_subslices; - sseu.max_eus_per_subslice = -RUNTIME_INFO (dev_priv)->sseu.max_eus_per_subslice; + sseu.max_slices = info->sseu.max_slices; + sseu.max_subslices = info->sseu.max_subslices; + sseu.max_eus_per_subslice = info->sseu.max_eus_per_subslice; with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {if (IS_CHERRYVIEW (dev_priv))
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/11 drm/i915: Add function to set SSEU info per platform
In reply to Stuart SummersAdd a new function to allow each platform to set maximum slice, subslice, and EU information to reduce code duplication.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 8 +++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 3 ++ drivers/gpu/drm/i915/i915_debugfs.c | 6 ++-- drivers/gpu/drm/i915/intel_device_info.c | 39 +++++++++--------------- 4 files changed, 28 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +8 -0
@@ -8,6 +8,14 @@#include "intel_lrc_reg.h" #include "intel_sseu.h" +void intel_sseu_set_info (struct sseu_dev_info *sseu,u8 max_slices, +u8 max_subslices,u8 max_eus_per_subslice) +{ + sseu->max_slices = max_slices; + sseu->max_subslices = max_subslices; + sseu->max_eus_per_subslice = max_eus_per_subslice; +} +unsigned int intel_sseu_subslice_total (const struct sseu_dev_info *sseu) {
drivers/gpu/drm/i915/gt/intel_sseu.h +3 -0
@@ -63,6 +63,9 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)return value; } +void intel_sseu_set_info (struct sseu_dev_info *sseu,u8 max_slices, +u8 max_subslices,u8 max_eus_per_subslice); +unsigned int intel_sseu_subslice_total (const struct sseu_dev_info *sseu);
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -3945,9 +3945,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)seq_puts (m,"SSEU Device Status\n" );memset (&sseu,0 ,sizeof (sseu)); - sseu.max_slices = info->sseu.max_slices; - sseu.max_subslices = info->sseu.max_subslices; - sseu.max_eus_per_subslice = info->sseu.max_eus_per_subslice; +intel_sseu_set_info (&sseu, info->sseu.max_slices, + info->sseu.max_subslices, + info->sseu.max_eus_per_subslice); with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {if (IS_CHERRYVIEW (dev_priv))
drivers/gpu/drm/i915/intel_device_info.c +14 -25
@@ -191,15 +191,10 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)u8 eu_en;int s; -if (IS_ELKHARTLAKE (dev_priv)) { - sseu->max_slices =1 ; - sseu->max_subslices =4 ; - sseu->max_eus_per_subslice =8 ; - }else { - sseu->max_slices =1 ; - sseu->max_subslices =8 ; - sseu->max_eus_per_subslice =8 ; - } +if (IS_ELKHARTLAKE (dev_priv)) +intel_sseu_set_info (sseu,1 ,4 ,8 ); +else +intel_sseu_set_info (sseu,1 ,8 ,8 ); s_en =I915_READ (GEN11_GT_SLICE_ENABLE ) &GEN11_GT_S_ENA_MASK ; ss_en = ~I915_READ (GEN11_GT_SUBSLICE_DISABLE );
@@ -236,11 +231,10 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)const int eu_mask =0xff ;u32 subslice_mask, eu_en; +intel_sseu_set_info (sseu,6 ,4 ,8 ); + sseu->slice_mask = (fuse2 &GEN10_F2_S_ENA_MASK ) >>GEN10_F2_S_ENA_SHIFT ; - sseu->max_slices =6 ; - sseu->max_subslices =4 ; - sseu->max_eus_per_subslice =8 ; subslice_mask = (1 <<4 ) -1 ; subslice_mask &= ~((fuse2 & GEN10_F2_SS_DIS_MASK) >>
@@ -314,9 +308,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) fuse =I915_READ (CHV_FUSE_GT ); sseu->slice_mask =BIT (0 ); - sseu->max_slices =1 ; - sseu->max_subslices =2 ; - sseu->max_eus_per_subslice =8 ; +intel_sseu_set_info (sseu,1 ,2 ,8 );if (!(fuse &CHV_FGT_DISABLE_SS0 )) { u8 disabled_mask =
@@ -372,9 +364,8 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv) sseu->slice_mask = (fuse2 &GEN8_F2_S_ENA_MASK ) >>GEN8_F2_S_ENA_SHIFT ;/* BXT has a single slice and at most 3 subslices. */ - sseu->max_slices =IS_GEN9_LP (dev_priv) ?1 :3 ; - sseu->max_subslices =IS_GEN9_LP (dev_priv) ?3 :4 ; - sseu->max_eus_per_subslice =8 ; +intel_sseu_set_info (sseu,IS_GEN9_LP (dev_priv) ?1 :3 , +IS_GEN9_LP (dev_priv) ?3 :4 ,8 );/* * The subslice disable field is global, i.e. it applies
@@ -473,9 +464,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv) fuse2 =I915_READ (GEN8_FUSE2 ); sseu->slice_mask = (fuse2 &GEN8_F2_S_ENA_MASK ) >>GEN8_F2_S_ENA_SHIFT ; - sseu->max_slices =3 ; - sseu->max_subslices =3 ; - sseu->max_eus_per_subslice =8 ; +intel_sseu_set_info (sseu,3 ,3 ,8 );/* * The subslice disable field is global, i.e. it applies
@@ -577,9 +566,6 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)break ; } - sseu->max_slices =hweight8 (sseu->slice_mask); - sseu->max_subslices =hweight8 (sseu->subslice_mask[0 ]); - fuse1 =I915_READ (HSW_PAVP_FUSE1 );switch ((fuse1 &HSW_F1_EU_DIS_MASK ) >>HSW_F1_EU_DIS_SHIFT ) {default :
@@ -596,7 +582,10 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) sseu->eu_per_subslice =6 ;break ; } - sseu->max_eus_per_subslice = sseu->eu_per_subslice; + +intel_sseu_set_info (sseu,hweight8 (sseu->slice_mask), +hweight8 (sseu->subslice_mask[0 ]), + sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) {for (ss =0 ; ss < sseu->max_subslices; ss++) {
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/11 drm/i915: Add subslice stride runtime parameter
In reply to Stuart SummersAdd a new parameter, ss_stride, to the runtime info structure. This is used to mirror the userspace concept of subslice stride, which is a range of subslices per slice.
This patch simply adds the definition and updates usage in the QUERY_TOPOLOGY_INFO handler.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 ++ drivers/gpu/drm/i915/gt/intel_sseu.h | 2 ++ drivers/gpu/drm/i915/i915_query.c | 5 ++--- 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +2 -0
@@ -14,6 +14,8 @@ void intel_sseu_set_info(struct sseu_dev_info *sseu, u8 max_slices, sseu->max_slices = max_slices; sseu->max_subslices = max_subslices; sseu->max_eus_per_subslice = max_eus_per_subslice; + + sseu->ss_stride =GEN_SSEU_STRIDE (sseu->max_subslices); }unsigned int
drivers/gpu/drm/i915/gt/intel_sseu.h +2 -0
@@ -33,6 +33,8 @@ struct sseu_dev_info {u8 max_subslices;u8 max_eus_per_subslice; +u8 ss_stride; +/* We don't have more than 8 eus per subslice at the moment and as we * store eus enabled using bits, no need to multiply by eus per * subslice.
drivers/gpu/drm/i915/i915_query.c +2 -3
@@ -37,7 +37,6 @@ static int query_topology_info(struct drm_i915_private *dev_priv,const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;struct drm_i915_query_topology_info topo;u32 slice_length, subslice_length, eu_length, total_length; -u8 subslice_stride =GEN_SSEU_STRIDE (sseu->max_subslices);u8 eu_stride =GEN_SSEU_STRIDE (sseu->max_eus_per_subslice);int ret;
@@ -50,7 +49,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv,BUILD_BUG_ON (sizeof (u8) !=sizeof (sseu->slice_mask)); slice_length =sizeof (sseu->slice_mask); - subslice_length = sseu->max_slices * subslice_stride; + subslice_length = sseu->max_slices * sseu->ss_stride; eu_length = sseu->max_slices * sseu->max_subslices * eu_stride; total_length =sizeof (topo) + slice_length + subslice_length + eu_length;
@@ -69,7 +68,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv, topo.max_eus_per_subslice = sseu->max_eus_per_subslice; topo.subslice_offset = slice_length; - topo.subslice_stride = subslice_stride; + topo.subslice_stride = sseu->ss_stride; topo.eu_offset = slice_length + subslice_length; topo.eu_stride = eu_stride;
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/11 drm/i915: Add EU stride runtime parameter
In reply to Stuart SummersAdd a new SSEU runtime parameter, eu_stride, which is used to mirror the userspace concept of a range of EUs per subslice.
This patch simply adds the parameter and updates usage in the QUERY_TOPOLOGY_INFO handler.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 1 + drivers/gpu/drm/i915/gt/intel_sseu.h | 1 + drivers/gpu/drm/i915/i915_query.c | 5 ++--- drivers/gpu/drm/i915/intel_device_info.c | 9 ++++----- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +1 -0
@@ -16,6 +16,7 @@ void intel_sseu_set_info(struct sseu_dev_info *sseu, u8 max_slices, sseu->max_eus_per_subslice = max_eus_per_subslice; sseu->ss_stride =GEN_SSEU_STRIDE (sseu->max_subslices); + sseu->eu_stride =GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); }unsigned int
drivers/gpu/drm/i915/gt/intel_sseu.h +1 -0
@@ -34,6 +34,7 @@ struct sseu_dev_info {u8 max_eus_per_subslice;u8 ss_stride; +u8 eu_stride;/* We don't have more than 8 eus per subslice at the moment and as we * store eus enabled using bits, no need to multiply by eus per
drivers/gpu/drm/i915/i915_query.c +2 -3
@@ -37,7 +37,6 @@ static int query_topology_info(struct drm_i915_private *dev_priv,const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;struct drm_i915_query_topology_info topo;u32 slice_length, subslice_length, eu_length, total_length; -u8 eu_stride =GEN_SSEU_STRIDE (sseu->max_eus_per_subslice);int ret;if (query_item->flags !=0 )
@@ -50,7 +49,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv, slice_length =sizeof (sseu->slice_mask); subslice_length = sseu->max_slices * sseu->ss_stride; - eu_length = sseu->max_slices * sseu->max_subslices * eu_stride; + eu_length = sseu->max_slices * sseu->max_subslices * sseu->eu_stride; total_length =sizeof (topo) + slice_length + subslice_length + eu_length;
@@ -70,7 +69,7 @@ static int query_topology_info(struct drm_i915_private *dev_priv, topo.subslice_offset = slice_length; topo.subslice_stride = sseu->ss_stride; topo.eu_offset = slice_length + subslice_length; - topo.eu_stride = eu_stride; + topo.eu_stride = sseu->eu_stride;if (__copy_to_user (u64_to_user_ptr (query_item->data_ptr), &topo,sizeof (topo)))
drivers/gpu/drm/i915/intel_device_info.c +4 -5
@@ -118,10 +118,9 @@ void intel_device_info_dump_runtime(const struct intel_runtime_info *info,static int sseu_eu_idx (const struct sseu_dev_info *sseu,int slice,int subslice) { -int subslice_stride =GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); -int slice_stride = sseu->max_subslices * subslice_stride; +int slice_stride = sseu->max_subslices * sseu->eu_stride; -return slice * slice_stride + subslice * subslice_stride; +return slice * slice_stride + subslice * sseu->eu_stride; } static u16 sseu_get_eus(const struct sseu_dev_info *sseu, int slice,
@@ -130,7 +129,7 @@ static u16 sseu_get_eus(const struct sseu_dev_info *sseu, int slice,int i, offset =sseu_eu_idx (sseu, slice, subslice);u16 eu_mask =0 ; -for (i =0 ; i <GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); i++) { +for (i =0 ; i < sseu->eu_stride; i++) { eu_mask |= ((u16 )sseu->eu_mask[offset + i]) << (i *BITS_PER_BYTE ); }
@@ -143,7 +142,7 @@ static void sseu_set_eus(struct sseu_dev_info *sseu, int slice, int subslice, {int i, offset =sseu_eu_idx (sseu, slice, subslice); -for (i =0 ; i <GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); i++) { +for (i =0 ; i < sseu->eu_stride; i++) { sseu->eu_mask[offset + i] = (eu_mask >> (BITS_PER_BYTE * i)) &0xff ; }
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/11 drm/i915: Use local variables for subslice_mask for device info
In reply to Stuart SummersWhen setting up subslice_mask, instead of operating on the slice array directly, use a local variable to start bits per slice, then use this to set the per slice array in one step.
--- drivers/gpu/drm/i915/intel_device_info.c | 49 +++++++++++++----------- 1 file changed, 26 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/intel_device_info.c +26 -23
@@ -235,18 +235,6 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) sseu->slice_mask = (fuse2 &GEN10_F2_S_ENA_MASK ) >>GEN10_F2_S_ENA_SHIFT ; - subslice_mask = (1 <<4 ) -1 ; - subslice_mask &= ~((fuse2 &GEN10_F2_SS_DIS_MASK ) >> -GEN10_F2_SS_DIS_SHIFT ); - -/* -* Slice0 can have up to 3 subslices, but there are only 2 in -* slice1/2. -*/ - sseu->subslice_mask[0 ] = subslice_mask; -for (s =1 ; s < sseu->max_slices; s++) - sseu->subslice_mask[s] = subslice_mask &0x3 ; -/* Slice0 */ eu_en = ~I915_READ (GEN8_EU_DISABLE0 );for (ss =0 ; ss < sseu->max_subslices; ss++)
@@ -270,14 +258,24 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) eu_en = ~I915_READ (GEN10_EU_DISABLE3 );sseu_set_eus (sseu,5 ,1 , eu_en & eu_mask); -/* Do a second pass where we mark the subslices disabled if all their -* eus are off. -*/ + subslice_mask = (1 <<4 ) -1 ; + subslice_mask &= ~((fuse2 &GEN10_F2_SS_DIS_MASK ) >> +GEN10_F2_SS_DIS_SHIFT ); +for (s =0 ; s < sseu->max_slices; s++) { +u32 subslice_mask_with_eus = subslice_mask; +for (ss =0 ; ss < sseu->max_subslices; ss++) {if (sseu_get_eus (sseu, s, ss) ==0 ) - sseu->subslice_mask[s] &= ~BIT (ss); + subslice_mask_with_eus &= ~BIT (ss); } + +/* +* Slice0 can have up to 3 subslices, but there are only 2 in +* slice1/2. +*/ + sseu->subslice_mask[s] = s ==0 ? subslice_mask_with_eus : + subslice_mask_with_eus &0x3 ; } sseu->eu_total =compute_eu_total (sseu);
@@ -303,6 +301,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;u32 fuse; +u8 subslice_mask =0 ; fuse =I915_READ (CHV_FUSE_GT );
@@ -316,7 +315,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) (((fuse &CHV_FGT_EU_DIS_SS0_R1_MASK ) >>CHV_FGT_EU_DIS_SS0_R1_SHIFT ) <<4 ); - sseu->subslice_mask[0 ] |=BIT (0 ); + subslice_mask |=BIT (0 );sseu_set_eus (sseu,0 ,0 , ~disabled_mask); }
@@ -327,10 +326,12 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) (((fuse &CHV_FGT_EU_DIS_SS1_R1_MASK ) >>CHV_FGT_EU_DIS_SS1_R1_SHIFT ) <<4 ); - sseu->subslice_mask[0 ] |=BIT (1 ); + subslice_mask |=BIT (1 );sseu_set_eus (sseu,0 ,1 , ~disabled_mask); } + sseu->subslice_mask[0 ] = subslice_mask; + sseu->eu_total =compute_eu_total (sseu);/*
@@ -540,6 +541,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;u32 fuse1; +u8 subslice_mask =0 ;int s, ss;/*
@@ -552,16 +554,15 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)/* fall through */ case 1 : sseu->slice_mask =BIT (0 ); - sseu->subslice_mask[0 ] =BIT (0 ); + subslice_mask =BIT (0 );break ;case 2 : sseu->slice_mask =BIT (0 ); - sseu->subslice_mask[0 ] =BIT (0 ) |BIT (1 ); + subslice_mask =BIT (0 ) |BIT (1 );break ;case 3 : sseu->slice_mask =BIT (0 ) |BIT (1 ); - sseu->subslice_mask[0 ] =BIT (0 ) |BIT (1 ); - sseu->subslice_mask[1 ] =BIT (0 ) |BIT (1 ); + subslice_mask =BIT (0 ) |BIT (1 );break ; }
@@ -583,10 +584,12 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) }intel_sseu_set_info (sseu,hweight8 (sseu->slice_mask), -hweight8 (sseu->subslice_mask[0 ]), +hweight8 (subslice_mask), sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) { + sseu->subslice_mask[s] = subslice_mask; +for (ss =0 ; ss < sseu->max_subslices; ss++) {sseu_set_eus (sseu, s, ss, (1UL << sseu->eu_per_subslice) -1 );
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/11] drm/i915: Use local variables for subslice_mask for device info
Quoting Stuart Summers (2019-08-21 00:05:38)
Quoted 48 lines
When setting up
subslice_mask, instead of operating on the slice array directly, use a local variable to start bits per slice, then use this to set the per slice array in one step.Signed-off-by Stuart Summers <[email protected]>--- drivers/gpu/drm/i915/intel_device_info.c | 49 +++++++++++++----------- 1 file changed, 26 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/intel_device_info.c +6
-15@@ -235,18 +235,6 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) sseu->slice_mask = (fuse2 &GEN10_F2_S_ENA_MASK ) >>GEN10_F2_S_ENA_SHIFT ; - subslice_mask = (1 <<4 ) -1 ; - subslice_mask &= ~((fuse2 &GEN10_F2_SS_DIS_MASK ) >> -GEN10_F2_SS_DIS_SHIFT ); - -/* -* Slice0 can have up to 3 subslices, but there are only 2 in -* slice1/2. -*/ - sseu->subslice_mask[0 ] = subslice_mask; -for (s =1 ; s < sseu->max_slices; s++) - sseu->subslice_mask[s] = subslice_mask &0x3 ; -/* Slice0 */ eu_en = ~I915_READ (GEN8_EU_DISABLE0 );for (ss =0 ; ss < sseu->max_subslices; ss++)@@ -270,14 +258,24 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) eu_en = ~I915_READ (GEN10_EU_DISABLE3 );sseu_set_eus (sseu,5 ,1 , eu_en & eu_mask); -/* Do a second pass where we mark the subslices disabled if all their -* eus are off. -*/ + subslice_mask = (1 <<4 ) -1 ; + subslice_mask &= ~((fuse2 &GEN10_F2_SS_DIS_MASK ) >> +GEN10_F2_SS_DIS_SHIFT ); +for (s =0 ; s < sseu->max_slices; s++) { +u32 subslice_mask_with_eus = subslice_mask; +for (ss =0 ; ss < sseu->max_subslices; ss++) {if (sseu_get_eus (sseu, s, ss) ==0 )
drivers/gpu/drm/i915/intel_device_info.c static void gen10_sseu_info_init(struct drm_i915_private *dev_priv) · line 278
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +8
-1- sseu->subslice_mask[s] &= ~BIT (ss); + subslice_mask_with_eus &= ~BIT (ss); } + +/* +* Slice0 can have up to 3 subslices, but there are only 2 in +* slice1/2. +*/ + sseu->subslice_mask[s] = s ==0 ? subslice_mask_with_eus : + subslice_mask_with_eus &0x3 ;
Ok. I have no idea what the topology is or why, but I followed the code and it should not be any logic changes.
Quoted 22 lines
drivers/gpu/drm/i915/intel_device_info.c +2
-1} sseu->eu_total =compute_eu_total (sseu);@@ -303,6 +301,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;u32 fuse; +u8 subslice_mask =0 ; fuse =I915_READ (CHV_FUSE_GT );@@ -316,7 +315,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) (((fuse &CHV_FGT_EU_DIS_SS0_R1_MASK ) >>CHV_FGT_EU_DIS_SS0_R1_SHIFT ) <<4 ); - sseu->subslice_mask[0 ] |=BIT (0 ); + subslice_mask |=BIT (0 );sseu_set_eus (sseu,0 ,0 , ~disabled_mask); }@@ -327,10 +326,12 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) (((fuse & CHV_FGT_EU_DIS_SS1_R1_MASK) >>
drivers/gpu/drm/i915/intel_device_info.c static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv) · line 335
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +3
-1CHV_FGT_EU_DIS_SS1_R1_SHIFT) << 4); - sseu->subslice_mask[0 ] |=BIT (1 ); + subslice_mask |=BIT (1 );sseu_set_eus (sseu,0 ,1 , ~disabled_mask); } + sseu->subslice_mask[0 ] = subslice_mask; + sseu->eu_total =compute_eu_total (sseu);
Ok.
Quoted 34 lines
drivers/gpu/drm/i915/intel_device_info.c +4
-4/* @@ -540,6 +541,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;u32 fuse1; +u8 subslice_mask =0 ;int s, ss;/* @@ -552,16 +554,15 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)/* fall through */ case 1 : sseu->slice_mask =BIT (0 ); - sseu->subslice_mask[0 ] =BIT (0 ); + subslice_mask =BIT (0 );break ;case 2 : sseu->slice_mask =BIT (0 ); - sseu->subslice_mask[0 ] =BIT (0 ) |BIT (1 ); + subslice_mask =BIT (0 ) |BIT (1 );break ;case 3 : sseu->slice_mask =BIT (0 ) |BIT (1 ); - sseu->subslice_mask[0 ] =BIT (0 ) |BIT (1 ); - sseu->subslice_mask[1 ] =BIT (0 ) |BIT (1 ); + subslice_mask =BIT (0 ) |BIT (1 );break ; }@@ -583,10 +584,12 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) } intel_sseu_set_info(sseu, hweight8(sseu->slice_mask),
drivers/gpu/drm/i915/intel_device_info.c static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) · line 595
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +3
-1-hweight8 (sseu->subslice_mask[0 ]), +hweight8 (subslice_mask), sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) { + sseu->subslice_mask[s] = subslice_mask; +for (ss =0 ; ss < sseu->max_subslices; ss++) {sseu_set_eus (sseu, s, ss, (1UL << sseu->eu_per_subslice) -1 );
Ok.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/11 drm/i915: Add function to set subslices
In reply to Stuart SummersAdd a new function to set a set of subslices for a given slice.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 6 ++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 3 +++ drivers/gpu/drm/i915/intel_device_info.c | 18 +++++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +6 -0
@@ -30,6 +30,12 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)return total; } +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, +u8 ss_mask) +{ + sseu->subslice_mask[i] = ss_mask &0xff ; +} +unsigned int intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) {
drivers/gpu/drm/i915/gt/intel_sseu.h +3 -0
@@ -75,6 +75,9 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu);unsigned int intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice); +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, +u8 ss_mask); +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
drivers/gpu/drm/i915/intel_device_info.c +11 -7
@@ -206,7 +206,10 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)int ss; sseu->slice_mask |=BIT (s); - sseu->subslice_mask[s] = (ss_en >> ss_idx) & ss_en_mask; + +intel_sseu_set_subslices (sseu, s, (ss_en >> ss_idx) & + ss_en_mask); +for (ss =0 ; ss < sseu->max_subslices; ss++) {if (sseu->subslice_mask[s] &BIT (ss))sseu_set_eus (sseu, s, ss, eu_en);
@@ -274,8 +277,9 @@ static void gen10_sseu_info_init(struct drm_i915_private *dev_priv)* Slice0 can have up to 3 subslices, but there are only 2 in * slice1/2. */ - sseu->subslice_mask[s] = s ==0 ? subslice_mask_with_eus : - subslice_mask_with_eus &0x3 ; +intel_sseu_set_subslices (sseu, s, s ==0 ? + subslice_mask_with_eus : + subslice_mask_with_eus &0x3 ); } sseu->eu_total =compute_eu_total (sseu);
@@ -330,7 +334,7 @@ static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv)sseu_set_eus (sseu,0 ,1 , ~disabled_mask); } - sseu->subslice_mask[0 ] = subslice_mask; +intel_sseu_set_subslices (sseu,0 , subslice_mask); sseu->eu_total =compute_eu_total (sseu);
@@ -384,7 +388,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)/* skip disabled slice */ continue ; - sseu->subslice_mask[s] = subslice_mask; +intel_sseu_set_subslices (sseu, s, subslice_mask); eu_disable =I915_READ (GEN9_EU_DISABLE (s));for (ss =0 ; ss < sseu->max_subslices; ss++) {
@@ -491,7 +495,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)/* skip disabled slice */ continue ; - sseu->subslice_mask[s] = subslice_mask; +intel_sseu_set_subslices (sseu, s, subslice_mask);for (ss =0 ; ss < sseu->max_subslices; ss++) {u8 eu_disabled_mask;
@@ -588,7 +592,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) { - sseu->subslice_mask[s] = subslice_mask; +intel_sseu_set_subslices (sseu, s, subslice_mask);for (ss =0 ; ss < sseu->max_subslices; ss++) { sseu_set_eus(sseu, s, ss,
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/11] drm/i915: Add function to set subslices
Quoting Stuart Summers (2019-08-21 00:05:39)
Quoted 15 lines
Add a new function to set a set of subslices for a given slice.
Signed-off-by Stuart Summers <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 6 ++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 3 +++ drivers/gpu/drm/i915/intel_device_info.c | 18 +++++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 36
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +4
-0@@ -30,6 +30,12 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)return total; } +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, +u8 ss_mask) +{ + sseu->subslice_mask[i] = ss_mask &0xff ;
What's i?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/11] drm/i915: Add function to set subslices
Quoted 20 lines · Chris Wilson
Quoting Stuart Summers (2019-08-21 00:05:39)
Quoted 19 lines
Add a new function to set a set of subslices for a given slice.
Signed-off-by Stuart Summers <[email protected]>---
drivers/gpu/drm/i915/gt/intel_sseu.c | 6 ++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 3 +++drivers/gpu/drm/i915/intel_device_info.c| 18 +++++++++++-------3 files changed, 20 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -30,6 +30,12 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu) return total; }
Quoted 8 lines
Quoted 6 lines
+void intel_sseu_set_subslices(structsseu_dev_info*sseu, int slice,
+ u8ss_mask)
+{
+ sseu->subslice_mask[i] =ss_mask&0xff;What's i?
Should be slice, not i :( not sure why the build wasn't catching this.
I'll fix in the next revision, thanks for the catch!
- Stuart
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/11 drm/i915: Use subslice stride to set subslices for a given slice
In reply to Stuart SummersAdd a subslice stride calculation when setting subslices. This aligns more closely with the userspace expectation of the subslice mask structure.
v2: Use local variable for subslice_mask on HSW and
clean up a few other subslice_mask local variable changes
v3: Add GEM_BUG_ON for ss_stride to prevent array overflow (Chris)
Split main set function and refactors in intel_device_info.c into separate patches (Chris)
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 12 ++++++++++-- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +10 -2
@@ -31,9 +31,17 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu) }void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, -u8 ss_mask) +u32 ss_mask) { - sseu->subslice_mask[i] = ss_mask &0xff ; +int i, offset; + +GEM_BUG_ON (sseu->ss_stride >32 ); + + offset = slice * sseu->ss_stride; + +for (i =0 ; i < sseu->ss_stride; i++) + sseu->subslice_mask[offset + i] = + (ss_mask >> (BITS_PER_BYTE * i)) &0xff ; }unsigned int
drivers/gpu/drm/i915/gt/intel_sseu.h +1 -1
@@ -76,7 +76,7 @@ unsigned int intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice);void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, -u8 ss_mask); +u32 ss_mask);u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/11] drm/i915: Use subslice stride to set subslices for a given slice
Quoting Stuart Summers (2019-08-21 00:05:40)
Quoted 26 lines
Add a subslice stride calculation when setting subslices. This aligns more closely with the userspace expectation of the subslice mask structure.
v2: Use local variable for
subslice_maskon HSW and
clean up a few othersubslice_masklocal variable changes
v3: AddGEM_BUG_ONforss_strideto prevent array overflow (Chris)
Split main set function and refactors inintel_device_info.cinto separate patches (Chris)Signed-off-by Stuart Summers <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 12 ++++++++++-- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-1@@ -31,9 +31,17 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu) } void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice, -u8 ss_mask)
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 42
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +8
-1+ u32 ss_mask) { - sseu->subslice_mask[i] = ss_mask &0xff ; +int i, offset; + +GEM_BUG_ON (sseu->ss_stride >32 ); + + offset = slice * sseu->ss_stride; + +for (i =0 ; i < sseu->ss_stride; i++)
You are saying that i can be a maximum of 32, and
u32 >> (8 * 32) is legal?
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 44
Quoted 2 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +2
-0+ sseu->subslice_mask[offset + i] = + (ss_mask >> (BITS_PER_BYTE * i)) &0xff ;
The 0xff is, and was, superfluous. Shrug.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/11] drm/i915: Use subslice stride to set subslices for a given slice
Quoted 35 lines · Chris Wilson
Quoting Stuart Summers (2019-08-21 00:05:40)
Quoted 34 lines
Add a subslice stride calculation when setting subslices. This aligns more closely with the userspace expectation of the subslice mask structure.
v2: Use local variable for
subslice_maskon HSW and clean up a few othersubslice_masklocal variable changes
v3: AddGEM_BUG_ONforss_strideto prevent array overflow (Chris) Split main set function and refactors inintel_device_info.cinto separate patches (Chris)Signed-off-by Stuart Summers <[email protected]>---
drivers/gpu/drm/i915/gt/intel_sseu.c | 12 ++++++++++--drivers/gpu/drm/i915/gt/intel_sseu.h| 2 +-2 files changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -31,9 +31,17 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu) }
void intel_sseu_set_subslices(structsseu_dev_info*sseu, int slice,
- u8ss_mask)
+ u32ss_mask)
{
- sseu->subslice_mask[i] =ss_mask&0xff;
+ int i, offset;
+
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 42
Quoted 5 lines
+ GEM_BUG_ON(sseu->ss_stride > 32);
drivers/gpu/drm/i915/gt/intel_sseu.c +4
-0+ + offset = slice * sseu->ss_stride; + + for (i = 0; i < sseu->ss_stride; i++)You are saying that i can be a maximum of 32, and
u32 >> (8 * 32) is legal?
Yeah the stride is calculated as a div-by-8, so really this should be max of 4, not 32. I'll fix this and repost.
Quoted 5 lines
Quoted 3 lines
+ sseu->subslice_mask[offset + i] =
+ (ss_mask >> (BITS_PER_BYTE* i)) &0xff;The
0xffis, and was, superfluous. Shrug.
I agree in the previous patch this wasn't really interesting. I can remove that. But here, IMO, having the explicit AND makes this clearer.
Thanks,
Stuart
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/11 drm/i915: Add function to determine if a slice has a subslice
In reply to Stuart SummersAdd a new function to determine whether a particular slice has a given subslice.
--- drivers/gpu/drm/i915/gt/intel_sseu.h | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 9 ++++----- 2 files changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.h +16 -0
@@ -10,6 +10,8 @@#include <linux/types.h> #include <linux/kernel.h> +#include "i915_gem.h" +struct drm_i915_private ;#define GEN_MAX_SLICES (6)/* CNL upper bound */
@@ -66,6 +68,20 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)return value; } +static inline bool +intel_sseu_has_subslice (const struct sseu_dev_info *sseu,int slice, +int subslice) +{ +u8 mask; +int ss_idx = subslice /BITS_PER_BYTE ; + +GEM_BUG_ON (ss_idx >= sseu->ss_stride); + + mask = sseu->subslice_mask[slice * sseu->ss_stride + ss_idx]; + +return mask &BIT (subslice %BITS_PER_BYTE ); +} +void intel_sseu_set_info (struct sseu_dev_info *sseu,u8 max_slices,u8 max_subslices,u8 max_eus_per_subslice);
drivers/gpu/drm/i915/intel_device_info.c +4 -5
@@ -210,10 +210,9 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)intel_sseu_set_subslices (sseu, s, (ss_en >> ss_idx) & ss_en_mask); -for (ss =0 ; ss < sseu->max_subslices; ss++) { -if (sseu->subslice_mask[s] &BIT (ss)) +for (ss =0 ; ss < sseu->max_subslices; ss++) +if (intel_sseu_has_subslice (sseu, s, ss))sseu_set_eus (sseu, s, ss, eu_en); - } } } sseu->eu_per_subslice =hweight8 (eu_en);
@@ -395,7 +394,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv)int eu_per_ss;u8 eu_disabled_mask; -if (!(sseu->subslice_mask[s] &BIT (ss))) +if (!intel_sseu_has_subslice (sseu, s, ss))/* skip disabled subslice */ continue ;
@@ -501,7 +500,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)u8 eu_disabled_mask;u32 n_disabled; -if (!(sseu->subslice_mask[s] &BIT (ss))) +if (!intel_sseu_has_subslice (sseu, s, ss))/* skip disabled subslice */ continue ;
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/11 drm/i915: Refactor instdone loops on new subslice functions
In reply to Stuart SummersRefactor instdone loops to use the new intel_sseu_has_subslice function.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 31 ++++++++++---------- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 5 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 5 ++-- 5 files changed, 25 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2 -1
@@ -948,6 +948,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, struct intel_instdone *instdone) {struct drm_i915_private *i915 = engine->i915; +const struct sseu_dev_info *sseu = &RUNTIME_INFO (i915)->sseu;struct intel_uncore *uncore = engine->uncore;u32 mmio_base = engine->mmio_base;int slice;
@@ -965,7 +966,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, instdone->slice_common =intel_uncore_read (uncore,GEN7_SC_INSTDONE ); -for_each_instdone_slice_subslice (i915, slice, subslice) { +for_each_instdone_slice_subslice (i915, sseu, slice, subslice) { instdone->sampler[slice][subslice] =read_subslice_reg (engine, slice, subslice,GEN7_SAMPLER_INSTDONE );
drivers/gpu/drm/i915/gt/intel_engine_types.h +15 -16
@@ -576,20 +576,19 @@ intel_engine_is_virtual(const struct intel_engine_cs *engine) return engine->flags & I915_ENGINE_IS_VIRTUAL; } -#define instdone_slice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask) - -#define instdone_subslice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.subslice_mask[0]) - -#define for_each_instdone_slice_subslice (dev_priv__, slice__, subslice__) \ - for ((slice__) = 0, (subslice__) = 0; \ - (slice__) < I915_MAX_SLICES; \ - (subslice__) = ((subslice__) + 1) < I915_MAX_SUBSLICES ? (subslice__) + 1 : 0, \ - (slice__) += ((subslice__) == 0)) \ - for_each_if((BIT(slice__) & instdone_slice_mask(dev_priv__)) && \ - (BIT(subslice__) & instdone_subslice_mask(dev_priv__))) - +#define instdone_has_slice (dev_priv___, sseu___, slice___) \ + ((IS_GEN(dev_priv___, 7) ? 1 : ((sseu___)->slice_mask)) & \ + BIT(slice___)) + +#define instdone_has_subslice (dev_priv__, sseu__, slice__, subslice__) \ + (IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \ + intel_sseu_has_subslice(sseu__, 0, subslice__)) + +#define for_each_instdone_slice_subslice (dev_priv_, sseu_, slice_, subslice_) \ + for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \ + (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \ + (slice_) += ((subslice_) == 0)) \ + for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \ + (instdone_has_subslice(dev_priv_, sseu_, slice_, \ + subslice_)))#endif /* __INTEL_ENGINE_TYPES_H__ */
drivers/gpu/drm/i915/gt/intel_hangcheck.c +2 -1
@@ -53,6 +53,7 @@ static bool instdone_unchanged(u32 current_instdone, u32 *old_instdone)static bool subunits_stuck (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; +const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;struct intel_instdone instdone;struct intel_instdone *accu_instdone = &engine->hangcheck.instdone;bool stuck;
@@ -71,7 +72,7 @@ static bool subunits_stuck(struct intel_engine_cs *engine) stuck &=instdone_unchanged (instdone.slice_common, &accu_instdone->slice_common); -for_each_instdone_slice_subslice (dev_priv, slice, subslice) { +for_each_instdone_slice_subslice (dev_priv, sseu, slice, subslice) { stuck &=instdone_unchanged (instdone.sampler[slice][subslice], &accu_instdone->sampler[slice][subslice]); stuck &= instdone_unchanged(instdone.row[slice][subslice],
drivers/gpu/drm/i915/i915_debugfs.c +3 -2
@@ -995,6 +995,7 @@ static void i915_instdone_info(struct drm_i915_private *dev_priv,struct seq_file *m, struct intel_instdone *instdone) { + const struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;int slice;int subslice;
@@ -1010,11 +1011,11 @@ static void i915_instdone_info(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) <=6 )return ; -for_each_instdone_slice_subslice (dev_priv, slice, subslice) +for_each_instdone_slice_subslice (dev_priv, sseu, slice, subslice)seq_printf (m,"\t\tSAMPLER_INSTDONE[%d][%d]: 0x%08x\n" , slice, subslice, instdone->sampler[slice][subslice]); -for_each_instdone_slice_subslice (dev_priv, slice, subslice) +for_each_instdone_slice_subslice (dev_priv, sseu, slice, subslice)seq_printf (m,"\t\tROW_INSTDONE[%d][%d]: 0x%08x\n" , slice, subslice, instdone->row[slice][subslice]); }
drivers/gpu/drm/i915/i915_gpu_error.c +3 -2
@@ -421,6 +421,7 @@ static void err_compression_marker(struct drm_i915_error_state_buf *m)static void error_print_instdone (struct drm_i915_error_state_buf *m,const struct drm_i915_error_engine *ee) { +const struct sseu_dev_info *sseu = &RUNTIME_INFO (m->i915)->sseu;int slice;int subslice;
@@ -436,12 +437,12 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m,if (INTEL_GEN (m->i915) <=6 )return ; -for_each_instdone_slice_subslice (m->i915, slice, subslice) +for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice)err_printf (m," SAMPLER_INSTDONE[%d][%d]: 0x%08x\n" , slice, subslice, ee->instdone.sampler[slice][subslice]); -for_each_instdone_slice_subslice (m->i915, slice, subslice) +for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice)err_printf (m," ROW_INSTDONE[%d][%d]: 0x%08x\n" , slice, subslice, ee->instdone.row[slice][subslice]);
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions
Quoting Stuart Summers (2019-08-21 00:05:42)
Quoted 17 lines
drivers/gpu/drm/i915/gt/intel_engine_types.h +0
-9@@ -576,20 +576,19 @@ intel_engine_is_virtual(const struct intel_engine_cs *engine)return engine->flags &I915_ENGINE_IS_VIRTUAL ; } -#define instdone_slice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask) - -#define instdone_subslice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.subslice_mask[0]) - -#define for_each_instdone_slice_subslice (dev_priv__, slice__, subslice__) \
drivers/gpu/drm/i915/gt/intel_engine_types.h intel_engine_is_virtual(const struct intel_engine_cs *engine) · line 581
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_engine_types.h +3
-7-for ((slice__) =0 , (subslice__) =0 ; \ - (slice__) <I915_MAX_SLICES ; \ - (subslice__) = ((subslice__) +1 ) <I915_MAX_SUBSLICES ? (subslice__) +1 :0 , \ - (slice__) += ((subslice__) ==0 )) \ -for_each_if ((BIT (slice__) &instdone_slice_mask (dev_priv__)) && \ - (BIT (subslice__) &instdone_subslice_mask (dev_priv__))) - +#define instdone_has_slice (dev_priv___, sseu___, slice___) \ + ((IS_GEN(dev_priv___, 7) ? 1 : ((sseu___)->slice_mask)) & \ + BIT(slice___))
((IS_GEN(dev_priv___, 7) ? 1 : \
((sseu___)->slice_mask)) & BIT(slice___))That split is marginally easier to read
So much for hoping the gen7 special case just disappears.
drivers/gpu/drm/i915/gt/intel_engine_types.h intel_engine_is_virtual(const struct intel_engine_cs *engine) · line 593
Quoted 11 lines
drivers/gpu/drm/i915/gt/intel_engine_types.h +11
-0+#define instdone_has_subslice (dev_priv__, sseu__, slice__, subslice__) \ + (IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \ + intel_sseu_has_subslice(sseu__, 0, subslice__)) + +#define for_each_instdone_slice_subslice (dev_priv_, sseu_, slice_, subslice_) \ + for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \ + (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \ + (slice_) += ((subslice_) == 0)) \ + for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \ + (instdone_has_subslice(dev_priv_, sseu_, slice_, \ + subslice_)))
That was less convoluted than I was expecting from previous skims.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions
Quoted 38 lines · Chris Wilson
Quoting Stuart Summers (2019-08-21 00:05:42)
Quoted 29 lines
drivers/gpu/drm/i915/gt/intel_engine_types.h +0
-0@@ -576,20 +576,19 @@ intel_engine_is_virtual(const struct intel_engine_cs *engine) return engine->flags & I915_ENGINE_IS_VIRTUAL; }drivers/gpu/drm/i915/gt/intel_engine_types.h +0
-9-#define instdone_slice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask) - -#define instdone_subslice_mask (dev_priv__) \ - (IS_GEN(dev_priv__, 7) ? \ - 1 : RUNTIME_INFO(dev_priv__)->sseu.subslice_mask[0]) - -#define for_each_instdone_slice_subslice(dev_priv__, slice__,
subslice__) \
- for ((slice__) = 0, (subslice__) = 0; \
- (slice__) <I915_MAX_SLICES; \
- (subslice__) = ((subslice__) + 1) <I915_MAX_SUBSLICES? (subslice__) + 1 : 0, \
- (slice__) += ((subslice__) == 0)) \
- for_each_if((BIT(slice__) &instdone_slice_mask(dev_priv__)) && \
- (BIT(subslice__) &instdone_subslice_mask(dev_priv__)))drivers/gpu/drm/i915/gt/intel_engine_types.h intel_engine_is_virtual(const struct intel_engine_cs *engine) · line 581
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_engine_types.h +3
-1- +#define instdone_has_slice (dev_priv___, sseu___, slice___) \ + ((IS_GEN(dev_priv___, 7) ? 1 : ((sseu___)->slice_mask)) & \ + BIT(slice___))((IS_GEN(dev_priv___, 7) ? 1 : \
((sseu___)->slice_mask)) &BIT(slice___))
Quoted 1 line
That split is marginally easier to read
Makes sense, and I agree what I have is a little ugly... I'll change in the next revision.
Quoted 22 lines
So much for hoping the gen7 special case just disappears.
Quoted 9 lines
+#define
instdone_has_subslice(dev_priv__, sseu__, slice__, subslice__)\
+ (IS_GEN(dev_priv__, 7) ? (1 &BIT(subslice__)) : \
+ intel_sseu_has_subslice(sseu__, 0,subslice__))drivers/gpu/drm/i915/gt/intel_engine_types.h +2
-0+ +#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_,
subslice_) \
+ for ((slice_) = 0, (subslice_) = 0; (slice_) <I915_MAX_SLICES; \Quoted 8 lines
+ (subslice_) = ((
subslice_) + 1) %I915_MAX_SUBSLICES, \
+ (slice_) += ((subslice_) == 0)) \
+ for_each_if((instdone_has_slice(dev_priv_,sseu_,slice_)) && \
+ (instdone_has_subslice(dev_priv_,sseu_,slice_, \
+ subslice_)))That was less convoluted than I was expecting from previous skims.
Quoted 1 line
Reviewed-by Chris Wilson <[email protected]>
Thanks!
-Stuart
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/11 drm/i915: Add new function to copy subslices for a slice
In reply to Stuart SummersAdd a new function to copy subslices for a specified slice between intel_sseu structures for the purpose of determining power-gate status.
--- drivers/gpu/drm/i915/i915_debugfs.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +14 -3
@@ -3721,6 +3721,15 @@ i915_cache_sharing_set(void *data, u64 val)return 0 ; } +static void +intel_sseu_copy_subslices (const struct sseu_dev_info *sseu,int slice, +u8 *to_mask) +{ +int offset = slice * sseu->ss_stride; + +memcpy (&to_mask[offset], &sseu->subslice_mask[offset], sseu->ss_stride); +} +DEFINE_SIMPLE_ATTRIBUTE (i915_cache_sharing_fops, i915_cache_sharing_get, i915_cache_sharing_set,"%llu\n" );
@@ -3794,7 +3803,7 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv,continue ; sseu->slice_mask |=BIT (s); - sseu->subslice_mask[s] = info->sseu.subslice_mask[s]; +intel_sseu_copy_subslices (&info->sseu, s, sseu->subslice_mask);for (ss =0 ; ss < info->sseu.max_subslices; ss++) {unsigned int eu_cnt;
@@ -3845,7 +3854,8 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, sseu->slice_mask |=BIT (s);if (IS_GEN9_BC (dev_priv)) - sseu->subslice_mask[s] = info->sseu.subslice_mask[s]; +intel_sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask);for (ss =0 ; ss < info->sseu.max_subslices; ss++) {unsigned int eu_cnt;
@@ -3881,7 +3891,8 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv,if (sseu->slice_mask) { sseu->eu_per_subslice = info->sseu.eu_per_subslice;for (s =0 ; s <fls (sseu->slice_mask); s++) - sseu->subslice_mask[s] = info->sseu.subslice_mask[s]; +intel_sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask); sseu->eu_total = sseu->eu_per_subslice *intel_sseu_subslice_total (sseu);
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/11] drm/i915: Add new function to copy subslices for a slice
Quoting Stuart Summers (2019-08-21 00:05:43)
Quoted 3 lines
Add a new function to copy subslices for a specified slice between
intel_sseustructures for the purpose of determining power-gate status.
And ss_stride happens to be one in all cases so far?
For one hsw variant, it is 2 if I am not mistaken. But that isn't converted.
Could you please drop a note saying that ss_stride is 1!
Quoted 1 line
Signed-off-by Stuart Summers <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/11] drm/i915: Add new function to copy subslices for a slice
Quoted 6 lines · Chris Wilson
Quoting Stuart Summers (2019-08-21 00:05:43)
Quoted 3 lines
Add a new function to copy subslices for a specified slice between
intel_sseustructures for the purpose of determining power-gate status.And
ss_stridehappens to be one in all cases so far?
True.
Quoted 3 lines
For one hsw variant, it is 2 if I am not mistaken. But that isn't converted.
I believe this is for the eu stride, not the subslice stride. We have the HSW_F1_EU_DIS_10EUS flag to represent this.
Quoted 2 lines
Could you please drop a note saying that
ss_strideis 1!
No problem though. I'll add this to the commit message.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Stuart Summers <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Thanks!
-Stuart
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/11 drm/i915: Expand subslice mask
In reply to Stuart SummersCurrently, the subslice_mask runtime parameter is stored as an array of subslices per slice. Expand the subslice mask array to better match what is presented to userspace through the I915_QUERY_TOPOLOGY_INFO ioctl. The index into this array is then calculated:
slice * subslice stride + subslice index / 8
v2: Fix 32-bit build
v3: Use new helper function in SSEU workaround warning message
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 27 ++++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 5 +++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 5 +++- drivers/gpu/drm/i915/intel_device_info.c | 8 +++--- 5 files changed, 40 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +26 -1
@@ -30,6 +30,31 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)return total; } +u32 intel_sseu_get_subslices (const struct sseu_dev_info *sseu,u8 slice) +{ +int i, offset = slice * sseu->ss_stride; +u32 mask =0 ; + +if (slice >= sseu->max_slices) { +DRM_ERROR ("%s: invalid slice %d, max: %d\n" , + __func__, slice, sseu->max_slices); +return 0 ; + } + +if (sseu->ss_stride >sizeof (mask)) { +DRM_ERROR ("%s: invalid subslice stride %d, max: %u\n" , + __func__, sseu->ss_stride, + (unsigned int )sizeof (mask)); +return 0 ; + } + +for (i =0 ; i < sseu->ss_stride; i++) + mask |= (u32 )sseu->subslice_mask[offset + i] << + i *BITS_PER_BYTE ; + +return mask; +} +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice,u32 ss_mask) {
@@ -47,7 +72,7 @@ void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice,unsigned int intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) { -return hweight8 (sseu->subslice_mask[slice]); +return hweight32 (intel_sseu_get_subslices (sseu, slice)); } u32 intel_sseu_make_rpcs(struct drm_i915_private *i915,
drivers/gpu/drm/i915/gt/intel_sseu.h +4 -1
@@ -17,10 +17,11 @@ struct drm_i915_private;#define GEN_MAX_SLICES (6)/* CNL upper bound */ #define GEN_MAX_SUBSLICES (8)/* ICL upper bound */ #define GEN_SSEU_STRIDE (max_entries) DIV_ROUND_UP(max_entries, BITS_PER_BYTE) +#define GEN_MAX_SUBSLICE_STRIDE GEN_SSEU_STRIDE(GEN_MAX_SUBSLICES)struct sseu_dev_info {u8 slice_mask; -u8 subslice_mask[GEN_MAX_SLICES ]; +u8 subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ];u16 eu_total;u8 eu_per_subslice;u8 min_eu_in_pool;
@@ -91,6 +92,8 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu);unsigned int intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice); +u32 intel_sseu_get_subslices (const struct sseu_dev_info *sseu,u8 slice); +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice,u32 ss_mask);
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -3
@@ -801,11 +801,10 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal) } slice =fls (sseu->slice_mask) -1 ; -GEM_BUG_ON (slice >=ARRAY_SIZE (sseu->subslice_mask)); - subslice =fls (l3_en & sseu->subslice_mask[slice]); + subslice =fls (l3_en &intel_sseu_get_subslices (sseu, slice));if (!subslice) {DRM_WARN ("No common index found between subslice mask %x and L3 bank mask %x!\n" , - sseu->subslice_mask[slice], l3_en); +intel_sseu_get_subslices (sseu, slice), l3_en); subslice =fls (l3_en);WARN_ON (!subslice); }
drivers/gpu/drm/i915/i915_debugfs.c +4 -1
@@ -3859,13 +3859,16 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,for (ss =0 ; ss < info->sseu.max_subslices; ss++) {unsigned int eu_cnt; +u8 ss_idx = s * info->sseu.ss_stride + + ss /BITS_PER_BYTE ;if (IS_GEN9_LP (dev_priv)) {if (!(s_reg[s] & (GEN9_PGCTL_SS_ACK (ss))))/* skip disabled subslice */ continue ; - sseu->subslice_mask[s] |=BIT (ss); + sseu->subslice_mask[ss_idx] |= +BIT (ss %BITS_PER_BYTE ); } eu_cnt = 2 * hweight32(eu_reg[2*s + ss/2] &
drivers/gpu/drm/i915/intel_device_info.c +4 -4
@@ -93,9 +93,9 @@ static void sseu_dump(const struct sseu_dev_info *sseu, struct drm_printer *p) hweight8(sseu->slice_mask), sseu->slice_mask);drm_printf (p,"subslice total: %u\n" ,intel_sseu_subslice_total (sseu));for (s =0 ; s < sseu->max_slices; s++) { -drm_printf (p,"slice%d: %u subslices, mask=%04x\n" , +drm_printf (p,"slice%d: %u subslices, mask=%08x\n" , s,intel_sseu_subslices_per_slice (sseu, s), - sseu->subslice_mask[s]); +intel_sseu_get_subslices (sseu, s)); }drm_printf (p,"EU total: %u\n" , sseu->eu_total);drm_printf (p,"EU per subslice: %u\n" , sseu->eu_per_subslice);
@@ -159,9 +159,9 @@ void intel_device_info_dump_topology(const struct sseu_dev_info *sseu, }for (s =0 ; s < sseu->max_slices; s++) { -drm_printf (p,"slice%d: %u subslice(s) (0x%hhx):\n" , +drm_printf (p,"slice%d: %u subslice(s) (0x%08x):\n" , s,intel_sseu_subslices_per_slice (sseu, s), - sseu->subslice_mask[s]); +intel_sseu_get_subslices (sseu, s));for (ss =0 ; ss < sseu->max_subslices; ss++) {u16 enabled_eus =sseu_get_eus (sseu, s, ss);
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 11/11] drm/i915: Expand subslice mask
Quoting Stuart Summers (2019-08-21 00:05:44)
Quoted 27 lines
Currently, the
subslice_maskruntime parameter is stored as an array of subslices per slice. Expand the subslice mask array to better match what is presented to userspace through theI915_QUERY_TOPOLOGY_INFOioctl. The index into this array is then calculated:
slice * subslice stride + subslice index / 8v2: Fix 32-bit build
v3: Use new helper function in SSEU workaround warning messageSigned-off-by Stuart Summers <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 27 ++++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 5 +++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 5 +++- drivers/gpu/drm/i915/intel_device_info.c | 8 +++--- 5 files changed, 40 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -30,6 +30,31 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)return total; }
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 42
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +10
-0+u32 intel_sseu_get_subslices (const struct sseu_dev_info *sseu,u8 slice) +{ +int i, offset = slice * sseu->ss_stride; +u32 mask =0 ; + +if (slice >= sseu->max_slices) { +DRM_ERROR ("%s: invalid slice %d, max: %d\n" , + __func__, slice, sseu->max_slices); +return 0 ; + }
That's a programmer error, we only need it during development. I am a proponent of making it explode as early as possible and make people fix it rather than ignore it.
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 49
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +6
-0+if (sseu->ss_stride >sizeof (mask)) { +DRM_ERROR ("%s: invalid subslice stride %d, max: %u\n" , + __func__, sseu->ss_stride, + (unsigned int )sizeof (mask)); +return 0 ; + }
Put the assertion in the constructor (set_sseu_info or whatever it was called)
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 53
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +4
-0+ +for (i =0 ; i < sseu->ss_stride; i++) + mask |= (u32 )sseu->subslice_mask[offset + i] << + i *BITS_PER_BYTE ;
Otherwise, the actual conversions look fairly straightforward,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 11/11] drm/i915: Expand subslice mask
Quoted 31 lines · Chris Wilson
Quoting Stuart Summers (2019-08-21 00:05:44)
Quoted 30 lines
Currently, the
subslice_maskruntime parameter is stored as an array of subslices per slice. Expand the subslice mask array to better match what is presented to userspace through theI915_QUERY_TOPOLOGY_INFOioctl. The index into this array is then calculated:
slice * subslice stride + subslice index / 8v2: Fix 32-bit build
v3: Use new helper function in SSEU workaround warning messageSigned-off-by Stuart Summers <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 27 ++++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 5 +++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 5 +++- drivers/gpu/drm/i915/intel_device_info.c | 8 +++--- 5 files changed, 40 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -30,6 +30,31 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)return total; }
Quoted 16 lines
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 42
Quoted 11 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +10
-0+u32 intel_sseu_get_subslices (const struct sseu_dev_info *sseu,u8 slice) +{ +int i, offset = slice * sseu->ss_stride; +u32 mask =0 ; + +if (slice >= sseu->max_slices) { +DRM_ERROR ("%s: invalid slice %d, max: %d\n" , + __func__, slice, sseu->max_slices); +return 0 ; + }That's a programmer error, we only need it during development. I am a proponent of making it explode as early as possible and make people fix
it rather than ignore it.
I guess this was trigger shyness on my part after bringing some of the ICL machines down with my first post of this series :) I agree this seems like the right thing to do though. I'll make the change in the next revision.
Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 49
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +6
-0+if (sseu->ss_stride >sizeof (mask)) { + DRM_ERROR("%s: invalid subslice stride %d, max: %u\n", + __func__, sseu->ss_stride, + (unsigned int )sizeof (mask)); +return 0 ; + }
Quoted 3 lines
Put the assertion in the constructor (
set_sseu_infoor whatever it was
called)
Makes sense.
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_sseu.c intel_sseu_subslice_total(const struct sseu_dev_info *sseu) · line 53
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +4
-0+ +for (i =0 ; i < sseu->ss_stride; i++) + mask |= (u32 )sseu->subslice_mask[offset + i] << + i *BITS_PER_BYTE ;Otherwise, the actual conversions look fairly straightforward,
Reviewed-by Chris Wilson <[email protected]>
Thanks!
-Stuart
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Refactor to expand subslice mask (rev 2)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev 2)
URL : https://patchwork.freedesktop.org/series/65509/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip f87889b5f343 drm/i915: Use variable for debugfs device status c0f971db0755 drm/i915: Add function to set SSEU info per platform 9643e69d50cb drm/i915: Add subslice stride runtime parameter 2c816f59af0c drm/i915: Add EU stride runtime parameter 9dc275ae6383 drm/i915: Use local variables for subslice_mask for device info 82d66cf37071 drm/i915: Add function to set subslices 3f42b57ebeb7 drm/i915: Use subslice stride to set subslices for a given slice e8185bff8829 drm/i915: Add function to determine if a slice has a subslice a8484fd14a66 drm/i915: Refactor instdone loops on new subslice functions -:60: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice__' - possible side-effects? #60: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:583: +#define instdone_has_subslice(dev_priv__, sseu__, slice__, subslice__) \ + (IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \ + intel_sseu_has_subslice(sseu__, 0, subslice__))
-:64: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv_' - possible side-effects? #64: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:587:
+#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_, subslice_) \
+ for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \
+ (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \
+ (slice_) += ((subslice_) == 0)) \
+ for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \
+ (instdone_has_subslice(dev_priv_, sseu_, slice_, \
+ subslice_)))
-:64: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'sseu_' - possible side-effects? #64: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:587:
+#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_, subslice_) \
+ for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \
+ (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \
+ (slice_) += ((subslice_) == 0)) \
+ for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \
+ (instdone_has_subslice(dev_priv_, sseu_, slice_, \
+ subslice_)))
-:64: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'slice_' - possible side-effects? #64: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:587:
+#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_, subslice_) \
+ for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \
+ (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \
+ (slice_) += ((subslice_) == 0)) \
+ for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \
+ (instdone_has_subslice(dev_priv_, sseu_, slice_, \
+ subslice_)))
-:64: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice_' - possible side-effects? #64: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:587:
+#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_, subslice_) \
+ for ((slice_) = 0, (subslice_) = 0; (slice_) < I915_MAX_SLICES; \
+ (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES, \
+ (slice_) += ((subslice_) == 0)) \
+ for_each_if((instdone_has_slice(dev_priv_, sseu_, slice_)) && \
+ (instdone_has_subslice(dev_priv_, sseu_, slice_, \
+ subslice_)))
total: 0 errors, 0 warnings, 5 checks, 106 lines checked abc23c9fc169 drm/i915: Add new function to copy subslices for a slice 771aa4749697 drm/i915: Expand subslice mask
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Refactor to expand subslice mask (rev 2)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev 2)
URL : https://patchwork.freedesktop.org/series/65509/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915: Use variable for debugfs device status Okay!
Commit: drm/i915: Add function to set SSEU info per platform Okay!
Commit: drm/i915: Add subslice stride runtime parameter Okay!
Commit: drm/i915: Add EU stride runtime parameter
Okay!
Commit: drm/i915: Use local variables for subslice_mask for device info Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Refactor to expand subslice mask (rev 2)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev 2)
URL : https://patchwork.freedesktop.org/series/65509/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6750 -> Patchwork_14114
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/
Known issues
------------
Here are the changes found in Patchwork_14114 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@legacy-render:
- fi-bxt-dsi: [PASS][1] -> [INCOMPLETE][2] ([fdo#103927])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/fi-bxt-dsi/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/fi-bxt-dsi/igt@[email protected]
- fi-icl-u3: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-cml-u2: [PASS][5] -> [DMESG-WARN][6] ([fdo#102505])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/fi-cml-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/fi-cml-u2/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_reset:
- fi-icl-u2: [INCOMPLETE][7] ([fdo#107713]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/fi-icl-u2/igt@i915_selftest@live_reset.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/fi-icl-u2/igt@i915_selftest@live_reset.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [FAIL][9] ([fdo#103167]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/fi-icl-u2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/fi-icl-u2/igt@[email protected]
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
Participating hosts (50 -> 42)
------------------------------
Additional (2): fi-skl-guc fi-pnv-d510
Missing (10): fi-kbl-soraka fi-ilk-m540 fi-icl-u4 fi-hsw-4200u fi-glk-dsi fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6750 -> Patchwork_14114
CI-20190529: 20190529
CI_DRM_6750: ba37f74dbdc1e78e70a5a2e5f4ce8d762d06eaa7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5146: 357dbe1869d88a2f08bcee4eebceff4ee9014424 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14114: 771aa4749697794e7898522473b266d9a85352f9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
771aa4749697 drm/i915: Expand subslice maskabc23c9fc169 drm/i915: Add new function to copy subslices for a slice a8484fd14a66 drm/i915: Refactor instdone loops on new subslice functions e8185bff8829 drm/i915: Add function to determine if a slice has a subslice 3f42b57ebeb7 drm/i915: Use subslice stride to set subslices for a given slice 82d66cf37071 drm/i915: Add function to set subslices9dc275ae6383 drm/i915: Use local variables for subslice_mask for device info 2c816f59af0c drm/i915: Add EU stride runtime parameter 9643e69d50cb drm/i915: Add subslice stride runtime parameter c0f971db0755 drm/i915: Add function to set SSEU info per platform f87889b5f343 drm/i915: Use variable for debugfs device status
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Refactor to expand subslice mask (rev 2)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev 2)
URL : https://patchwork.freedesktop.org/series/65509/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6750_full -> Patchwork_14114_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14114_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110841])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb8/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-hang-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#111325]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb8/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb1/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl5/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl2/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][7] -> [FAIL][8] ([fdo#102670])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl10/igt@[email protected]
- shard-glk: [PASS][11] -> [FAIL][12] ([fdo#105363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-glk9/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-glk4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103167]) +5 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-skl: [PASS][15] -> [INCOMPLETE][16] ([fdo#104108])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl1/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103166])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb7/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb8/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb8/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109276]) +15 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb7/igt@[email protected]
* igt@syncobj_wait@wait-any-snapshot:
- shard-apl: [PASS][25] -> [INCOMPLETE][26] ([fdo#103927]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@vecs0-s3:
- shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl6/igt@[email protected]
* igt@gem_eio@reset-stress:
- shard-skl: [FAIL][29] ([fdo#109661]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl5/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl8/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][31] ([fdo#110854]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][33] ([fdo#109276]) -> [PASS][34] +17 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][35] ([fdo#111325]) -> [PASS][36] +7 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb5/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding:
- shard-iclb: [INCOMPLETE][37] ([fdo#107713]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb7/igt@[email protected]
* igt@kms_cursor_legacy@pipe-c-single-move:
- shard-apl: [INCOMPLETE][39] ([fdo#103927]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl1/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl8/igt@[email protected]
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: [INCOMPLETE][41] ([fdo#104108]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl10/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
- shard-iclb: [FAIL][43] ([fdo#103167]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][45] ([fdo#103166]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb1/igt@kms_psr@psr2_suspend.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][49] ([fdo#99912]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl5/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl6/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][51] ([fdo#110728]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl10/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl9/igt@[email protected]
#### Warnings ####
* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [FAIL][53] ([fdo#111330]) -> [SKIP][54] ([fdo#109276]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-iclb2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-iclb8/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][55] ([fdo#108566]) -> [INCOMPLETE][56] ([fdo#103927])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-apl7/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-apl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt:
- shard-skl: [FAIL][57] ([fdo#108040]) -> [FAIL][58] ([fdo#103167])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6750/shard-skl7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/shard-skl8/igt@[email protected]
[fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6750 -> Patchwork_14114
CI-20190529: 20190529
CI_DRM_6750: ba37f74dbdc1e78e70a5a2e5f4ce8d762d06eaa7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5146: 357dbe1869d88a2f08bcee4eebceff4ee9014424 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14114: 771aa4749697794e7898522473b266d9a85352f9 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14114/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx