Refactor to expand subslice mask
Subsystems (2)
cover Refactor to expand subslice mask
This patch series contains a few code clean-up patches, followed by a patch which changes the storage of the subslice mask to better match the userspace access through the I915_QUERY_TOPOLOGY_INFO ioctl. The index into the subslice_mask array is then calculated:
slice * subslice stride + subslice index / 8
v2: fix i915_pm_sseu test failure
v3: no changes to patches in the series, just resending to pick up
in CI correctly
Stuart Summers (5):
drm/i915: Use local variable for SSEU info in GETPARAM ioctl drm/i915: Add macro for SSEU stride calculation drm/i915: Move calculation of subslices per slice to new function drm/i915: Move sseu helper functions to intel_sseu.h drm/i915: Expand subslice mask
drivers/gpu/drm/i915/i915_debugfs.c | 45 ++++--- drivers/gpu/drm/i915/i915_drv.c | 15 ++- drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- drivers/gpu/drm/i915/i915_query.c | 15 +-- drivers/gpu/drm/i915/intel_device_info.c | 143 +++++++++++++--------- drivers/gpu/drm/i915/intel_device_info.h | 47 ------- drivers/gpu/drm/i915/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/intel_engine_types.h | 32 ++--- drivers/gpu/drm/i915/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/intel_sseu.h | 96 ++++++++++++++- drivers/gpu/drm/i915/intel_workarounds.c | 2 +- 11 files changed, 245 insertions(+), 164 deletions(-)
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/5 drm/i915: Use local variable for SSEU info in GETPARAM ioctl
In the GETPARAM ioctl handler, use a local variable to consolidate usage of SSEU runtime info.
--- drivers/gpu/drm/i915/i915_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -5
@@ -319,6 +319,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, {struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev = dev_priv->drm.pdev; +struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;drm_i915_getparam_t *param = data;int value;
@@ -372,12 +373,12 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, value =i915_cmd_parser_get_version (dev_priv);break ;case I915_PARAM_SUBSLICE_TOTAL : - value =sseu_subslice_total (&RUNTIME_INFO (dev_priv)->sseu); + value =sseu_subslice_total (sseu);if (!value)return -ENODEV ;break ;case I915_PARAM_EU_TOTAL : - value =RUNTIME_INFO (dev_priv)->sseu.eu_total; + value = sseu->eu_total;if (!value)return -ENODEV ;break ;
@@ -394,7 +395,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, value =HAS_POOLED_EU (dev_priv);break ;case I915_PARAM_MIN_EU_IN_POOL : - value =RUNTIME_INFO (dev_priv)->sseu.min_eu_in_pool; + value = sseu->min_eu_in_pool;break ;case I915_PARAM_HUC_STATUS : value =intel_huc_check_status (&dev_priv->huc);
@@ -444,12 +445,12 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, value =intel_engines_has_context_isolation (dev_priv);break ;case I915_PARAM_SLICE_MASK : - value =RUNTIME_INFO (dev_priv)->sseu.slice_mask; + value = sseu->slice_mask;if (!value)return -ENODEV ;break ;case I915_PARAM_SUBSLICE_MASK : - value =RUNTIME_INFO (dev_priv)->sseu.subslice_mask[0 ]; + value = sseu->subslice_mask[0 ];if (!value)return -ENODEV ;break ;
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: Add macro for SSEU stride calculation
In reply to Stuart SummersSubslice stride and EU stride are calculated multiple times in i915_query. Move this calculation to a macro to reduce code duplication.
--- drivers/gpu/drm/i915/i915_query.c | 17 ++++++++--------- drivers/gpu/drm/i915/intel_sseu.h | 1 + 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_query.c +8 -9
@@ -37,6 +37,8 @@ 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;if (query_item->flags !=0 )
@@ -48,12 +50,10 @@ 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 * -DIV_ROUND_UP (sseu->max_subslices,BITS_PER_BYTE ); - eu_length = sseu->max_slices * sseu->max_subslices * -DIV_ROUND_UP (sseu->max_eus_per_subslice,BITS_PER_BYTE ); - - total_length =sizeof (topo) + slice_length + subslice_length + eu_length; + subslice_length = sseu->max_slices * subslice_stride; + eu_length = sseu->max_slices * sseu->max_subslices * eu_stride; + total_length =sizeof (topo) + slice_length + subslice_length + + eu_length; ret =copy_query_item (&topo,sizeof (topo), total_length, query_item);
@@ -69,10 +69,9 @@ 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 =DIV_ROUND_UP (sseu->max_subslices,BITS_PER_BYTE ); + topo.subslice_stride = subslice_stride; topo.eu_offset = slice_length + subslice_length; - topo.eu_stride = -DIV_ROUND_UP (sseu->max_eus_per_subslice,BITS_PER_BYTE ); + topo.eu_stride = eu_stride;if (__copy_to_user (u64_to_user_ptr (query_item->data_ptr), &topo,sizeof (topo)))
drivers/gpu/drm/i915/intel_sseu.h +1 -0
@@ -13,6 +13,7 @@ struct drm_i915_private;#define GEN_MAX_SLICES (6)/* CNL upper bound */ #define GEN_MAX_SUBSLICES (8)/* ICL upper bound */ +#define GEN_SSEU_STRIDE (bits) DIV_ROUND_UP(bits, BITS_PER_BYTE)struct sseu_dev_info {u8 slice_mask;
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Move calculation of subslices per slice to new function
In reply to Stuart SummersAdd a new function to return the number of subslices per slice to consolidate code usage.
v2: rebase on changes to move sseu struct to intel_sseu.h
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 4 ++-- drivers/gpu/drm/i915/intel_sseu.h | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -4191,7 +4191,7 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info, sseu_subslice_total(sseu));for (s =0 ; s <fls (sseu->slice_mask); s++) {seq_printf (m," %s Slice%i subslices: %u\n" , type, - s,hweight8 (sseu->subslice_mask[s])); + s,sseu_subslices_per_slice (sseu, s)); }seq_printf (m," %s EU Total: %u\n" , type, sseu->eu_total);
drivers/gpu/drm/i915/intel_device_info.c +2 -2
@@ -93,7 +93,7 @@ static void sseu_dump(const struct sseu_dev_info *sseu, struct drm_printer *p)drm_printf (p,"subslice total: %u\n" ,sseu_subslice_total (sseu));for (s =0 ; s < sseu->max_slices; s++) {drm_printf (p,"slice%d: %u subslices, mask=%04x\n" , - s,hweight8 (sseu->subslice_mask[s]), + s,sseu_subslices_per_slice (sseu, s), sseu->subslice_mask[s]); }drm_printf (p,"EU total: %u\n" , sseu->eu_total);
@@ -126,7 +126,7 @@ 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" , - s,hweight8 (sseu->subslice_mask[s]), + s,sseu_subslices_per_slice (sseu, s), sseu->subslice_mask[s]);for (ss =0 ; ss < sseu->max_subslices; ss++) {
drivers/gpu/drm/i915/intel_sseu.h +6 -0
@@ -62,6 +62,12 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)return value; } +static inline unsigned int +sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) +{ +return hweight8 (sseu->subslice_mask[slice]); +} +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: Move sseu helper functions to intel_sseu.h
In reply to Stuart Summers--- drivers/gpu/drm/i915/intel_device_info.h | 47 ------------------------ drivers/gpu/drm/i915/intel_sseu.h | 47 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/intel_device_info.h +0 -47
@@ -216,53 +216,6 @@ struct intel_driver_caps { bool has_logical_contexts:1; }; -static inline unsigned int sseu_subslice_total (const struct sseu_dev_info *sseu) -{ -unsigned int i, total =0 ; - -for (i =0 ; i <ARRAY_SIZE (sseu->subslice_mask); i++) - total +=hweight8 (sseu->subslice_mask[i]); - -return total; -} - -static inline int sseu_eu_idx (const struct sseu_dev_info *sseu, -int slice,int subslice) -{ -int subslice_stride =DIV_ROUND_UP (sseu->max_eus_per_subslice, -BITS_PER_BYTE ); -int slice_stride = sseu->max_subslices * subslice_stride; - -return slice * slice_stride + subslice * subslice_stride; -} - -static inline u16 sseu_get_eus (const struct sseu_dev_info *sseu, -int slice,int subslice) -{ -int i, offset =sseu_eu_idx (sseu, slice, subslice); -u16 eu_mask =0 ; - -for (i =0 ; - i <DIV_ROUND_UP (sseu->max_eus_per_subslice,BITS_PER_BYTE ); i++) { - eu_mask |= ((u16 ) sseu->eu_mask[offset + i]) << - (i *BITS_PER_BYTE ); - } - -return eu_mask; -} - -static inline void sseu_set_eus (struct sseu_dev_info *sseu, -int slice,int subslice,u16 eu_mask) -{ -int i, offset =sseu_eu_idx (sseu, slice, subslice); - -for (i =0 ; - i <DIV_ROUND_UP (sseu->max_eus_per_subslice,BITS_PER_BYTE ); i++) { - sseu->eu_mask[offset + i] = - (eu_mask >> (BITS_PER_BYTE * i)) &0xff ; - } -} -const char *intel_platform_name (enum intel_platform platform);void intel_device_info_subplatform_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_sseu.h +47 -0
59 lines not on this page · raw message
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 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 spacing in set_sseu_info args
use set_sseu_info to initialize sseu data when building device status in debugfs
rename variables in intel_engine_types.h to avoid checkpatch warnings
--- drivers/gpu/drm/i915/i915_debugfs.c | 43 ++++--- drivers/gpu/drm/i915/i915_drv.c | 6 +- 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 | 139 +++++++++++++--------- drivers/gpu/drm/i915/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/intel_engine_types.h | 32 ++--- drivers/gpu/drm/i915/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/intel_sseu.h | 44 ++++++- drivers/gpu/drm/i915/intel_workarounds.c | 2 +- 10 files changed, 182 insertions(+), 108 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +24 -19
@@ -1250,6 +1250,7 @@ static void i915_instdone_info(struct drm_i915_private *dev_priv,struct seq_file *m, struct intel_instdone *instdone) { + struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;int slice;int subslice;
@@ -1265,11 +1266,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]); }
@@ -4072,7 +4073,9 @@ 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]; +sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask, + info->sseu.subslice_mask);for (ss =0 ; ss < info->sseu.max_subslices; ss++) {unsigned int eu_cnt;
@@ -4123,18 +4126,22 @@ 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_copy_subslices (&info->sseu, s, + sseu->subslice_mask, + info->sseu.subslice_mask);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] &
@@ -4151,25 +4158,24 @@ 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) { +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_copy_subslices (&info->sseu, s, + sseu->subslice_mask, + info->sseu.subslice_mask); sseu->eu_total = sseu->eu_per_subslice *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); }
@@ -4216,6 +4222,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;
@@ -4223,14 +4230,12 @@ 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; +set_sseu_info (&sseu, info->sseu.max_slices, info->sseu.max_subslices, + info->sseu.max_eus_per_subslice); with_intel_runtime_pm(dev_priv, wakeref) {if (IS_CHERRYVIEW (dev_priv))
drivers/gpu/drm/i915/i915_drv.c +4 -2
@@ -321,7 +321,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,struct pci_dev *pdev = dev_priv->drm.pdev;struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;drm_i915_getparam_t *param = data; -int value; +int value =0 ;switch (param->param) {case I915_PARAM_IRQ_ACTIVE :
@@ -450,7 +450,9 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,return -ENODEV ;break ;case I915_PARAM_SUBSLICE_MASK : - value = sseu->subslice_mask[0 ]; +/* Only copy bits from the first subslice */ +memcpy (&value, sseu->subslice_mask, +min (sseu->ss_stride, (u8 )sizeof (value)));if (!value)return -ENODEV ;break ;
drivers/gpu/drm/i915/i915_gpu_error.c +3 -2
@@ -405,6 +405,7 @@ static void print_error_buffers(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) { +struct sseu_dev_info *sseu = &RUNTIME_INFO (m->i915)->sseu;int slice;int subslice;
@@ -420,12 +421,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]);
drivers/gpu/drm/i915/i915_query.c +4 -6
@@ -37,8 +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;if (query_item->flags !=0 )
@@ -50,8 +48,8 @@ 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; - eu_length = sseu->max_slices * sseu->max_subslices * eu_stride; + subslice_length = sseu->max_slices * sseu->ss_stride; + eu_length = sseu->max_slices * sseu->max_subslices * sseu->eu_stride; total_length =sizeof (topo) + slice_length + subslice_length + eu_length;
@@ -69,9 +67,9 @@ 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; + 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 +81 -58
291 lines not on this page · raw message
drivers/gpu/drm/i915/intel_engine_cs.c +4 -2
@@ -890,7 +890,7 @@ u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv)const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;u32 mcr_s_ss_select;u32 slice =fls (sseu->slice_mask); -u32 subslice =fls (sseu->subslice_mask[slice]); +u32 subslice =fls (sseu->subslice_mask[slice * sseu->ss_stride]);if (IS_GEN (dev_priv,10 )) mcr_s_ss_select = GEN8_MCR_SLICE(slice) |
@@ -966,6 +966,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, struct intel_instdone *instdone) {struct drm_i915_private *dev_priv = engine->i915; +struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;struct intel_uncore *uncore = engine->uncore;u32 mmio_base = engine->mmio_base;int slice;
@@ -983,7 +984,8 @@ 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 (dev_priv, slice, subslice) { +for_each_instdone_slice_subslice (dev_priv, sseu, slice, + subslice) { instdone->sampler[slice][subslice] =read_subslice_reg (dev_priv, slice, subslice,GEN7_SAMPLER_INSTDONE );
drivers/gpu/drm/i915/intel_engine_types.h +17 -15
@@ -530,20 +530,22 @@ intel_engine_needs_breadcrumb_tasklet(const struct intel_engine_cs *engine) return engine->flags & I915_ENGINE_NEEDS_BREADCRUMB_TASKLET; } -#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 : (sseu__)->subslice_mask[slice__ * (sseu__)->ss_stride + \ + subslice__ / BITS_PER_BYTE]) & \ + BIT(subslice__ % BITS_PER_BYTE)) \ + +#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 ? (subslice_) + 1 : 0, \ + (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/intel_hangcheck.c +2 -1
@@ -50,6 +50,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; +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/intel_sseu.h +42 -2
71 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.c +1 -1
@@ -771,7 +771,7 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)u32 slice =fls (sseu->slice_mask);u32 fuse3 =intel_uncore_read (&i915->uncore,GEN10_MIRROR_FUSE3 ); -u8 ss_mask = sseu->subslice_mask[slice]; +u8 ss_mask = sseu->subslice_mask[slice * sseu->ss_stride];u8 enabled_mask = (ss_mask | ss_mask >>GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ;
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx