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
v4: rebase
v5: fix header test
v6: address review comments from Jari
address minor checkpatch warning in existing code use eu_stride for EU div-by-8
Stuart Summers (6):
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: Remove inline from sseu helper functions drm/i915: Expand subslice mask
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 32 +-- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 85 ++++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 30 ++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 50 +++-- 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 | 209 +++++++++++-------- drivers/gpu/drm/i915/intel_device_info.h | 47 ----- 12 files changed, 302 insertions(+), 197 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/6 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
@@ -321,6 +321,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;
@@ -374,12 +375,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 ;
@@ -396,7 +397,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);
@@ -446,12 +447,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 1/6 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.
v2: add const to sseu_dev_info variable
--- drivers/gpu/drm/i915/i915_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -5
@@ -324,6 +324,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; +const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;drm_i915_getparam_t *param = data;int value;
@@ -377,12 +378,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 ;
@@ -399,7 +400,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);
@@ -449,12 +450,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/6 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.
v2: update headers in intel_sseu.h
--- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 ++ drivers/gpu/drm/i915/i915_query.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.h +2 -0
@@ -8,11 +8,13 @@#define __INTEL_SSEU_H__#include <linux/types.h> +#include <linux/kernel.h> 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;
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)))
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/6 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/gt/intel_sseu.h | 6 ++++++ drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.h +6 -0
@@ -63,6 +63,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);
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -4184,7 +4184,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++) {
Signature · 6 lines
2.21.0.5.gaeb582a983 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/6 drm/i915: Move sseu helper functions to intel_sseu.h
In reply to Stuart Summersv2: fix spacing from checkpatch warning
--- drivers/gpu/drm/i915/gt/intel_sseu.h | 47 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 47 ------------------------ 2 files changed, 47 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.h +47 -0
@@ -63,12 +63,59 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)return value; } +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 unsigned int sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) {return hweight8 (sseu->subslice_mask[slice]); } +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 ; + } +} +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
drivers/gpu/drm/i915/intel_device_info.h +0 -47
53 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/6 drm/i915: Remove inline from sseu helper functions
In reply to Stuart SummersAdditionally, ensure these are all prefixed with intel_sseu_* to match the convention of other functions in i915.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 54 +++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 57 +++----------------- drivers/gpu/drm/i915/i915_debugfs.c | 6 +-- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 69 ++++++++++++------------ 5 files changed, 102 insertions(+), 86 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +54 -0
@@ -8,6 +8,60 @@#include "intel_lrc_reg.h" #include "intel_sseu.h" +unsigned int +intel_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; +} + +unsigned int +intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) +{ +return hweight8 (sseu->subslice_mask[slice]); +} + +static int intel_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; +} + +u16 intel_sseu_get_eus (const struct sseu_dev_info *sseu,int slice, +int subslice) +{ +int i, offset =intel_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; +} + +void intel_sseu_set_eus (struct sseu_dev_info *sseu,int slice,int subslice, +u16 eu_mask) +{ +int i, offset =intel_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 ; + } +} +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu) {
drivers/gpu/drm/i915/gt/intel_sseu.h +8 -49
66 lines not on this page · raw message
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -4157,7 +4157,7 @@ static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv,RUNTIME_INFO (dev_priv)->sseu.subslice_mask[s]; } sseu->eu_total = sseu->eu_per_subslice * -sseu_subslice_total (sseu); +intel_sseu_subslice_total (sseu);/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s <fls (sseu->slice_mask); s++) {
@@ -4181,10 +4181,10 @@ static void i915_print_sseu_info(struct seq_file *m, bool is_available_info,seq_printf (m," %s Slice Total: %u\n" , type,hweight8 (sseu->slice_mask));seq_printf (m," %s Subslice Total: %u\n" , type, -sseu_subslice_total (sseu)); +intel_sseu_subslice_total (sseu));for (s =0 ; s <fls (sseu->slice_mask); s++) {seq_printf (m," %s Slice%i subslices: %u\n" , type, - s,sseu_subslices_per_slice (sseu, s)); + s,intel_sseu_subslices_per_slice (sseu, s)); }seq_printf (m," %s EU Total: %u\n" , type, sseu->eu_total);
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -375,7 +375,7 @@ 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 (sseu); + value =intel_sseu_subslice_total (sseu);if (!value)return -ENODEV ;break ;
drivers/gpu/drm/i915/intel_device_info.c +36 -33
181 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 6/6 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
v3: update headers in intel_sseu.h
v4: add const to some sseu_dev_info variables
use sseu->eu_stride for EU stride calculations
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 32 +++-- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 49 +++++-- drivers/gpu/drm/i915/gt/intel_sseu.h | 16 ++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 44 +++--- 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 | 142 +++++++++++-------- 11 files changed, 198 insertions(+), 117 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +4 -2
@@ -908,7 +908,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) |
@@ -984,6 +984,7 @@ void intel_engine_get_instdone(struct intel_engine_cs *engine, struct intel_instdone *instdone) {struct drm_i915_private *dev_priv = engine->i915; +const struct sseu_dev_info *sseu = &RUNTIME_INFO (dev_priv)->sseu;struct intel_uncore *uncore = engine->uncore;u32 mmio_base = engine->mmio_base;int slice;
@@ -1001,7 +1002,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/gt/intel_engine_types.h +17 -15
@@ -534,20 +534,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/gt/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; +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/gt/intel_sseu.c +40 -9
79 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_sseu.h +15 -1
@@ -9,16 +9,18 @@#include <linux/types.h> #include <linux/kernel.h> +#include <linux/string.h> 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) +#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;
@@ -33,6 +35,9 @@ struct sseu_dev_info {u8 max_subslices;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 * subslice.
@@ -63,12 +68,21 @@ 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);unsigned int intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice); +void intel_sseu_copy_subslices (const struct sseu_dev_info *sseu,int slice, +u8 *to_mask,const u8 *from_mask); + +void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, +u32 ss_mask); +u16 intel_sseu_get_eus (const struct sseu_dev_info *sseu,int slice,int subslice);
drivers/gpu/drm/i915/gt/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 ;
drivers/gpu/drm/i915/i915_debugfs.c +25 -19
112 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.c +4 -2
@@ -323,7 +323,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 :
@@ -452,7 +452,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 +83 -59
300 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
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Refactor to expand subslice mask (rev5)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev5)
URL : https://patchwork.freedesktop.org/series/59742/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 2699899bf520 drm/i915: Use local variable for SSEU info in GETPARAM ioctl 5c73378a02c2 drm/i915: Add macro for SSEU stride calculation 1aa1a9b832aa drm/i915: Move calculation of subslices per slice to new function f03d45e541ca drm/i915: Move sseu helper functions to intel_sseu.h 2b9349156f64 drm/i915: Remove inline from sseu helper functions 9b09ab1e44a3 drm/i915: Expand subslice mask -:84: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'sseu__' - possible side-effects? #84: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:542: +#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)) \ +
-:84: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'slice__' may be better as '(slice__)' to avoid precedence issues #84: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:542:
+#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)) \
+
-:84: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice__' - possible side-effects? #84: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:542:
+#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)) \
+
-:84: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'subslice__' may be better as '(subslice__)' to avoid precedence issues #84: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:542:
+#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)) \
+
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv_' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:548:
+#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_)) \
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'sseu_' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:548:
+#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_)) \
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'slice_' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:548:
+#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_)) \
-:90: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice_' - possible side-effects? #90: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:548:
+#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_)) \
total: 0 errors, 0 warnings, 8 checks, 692 lines checked
_______________________________________________
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 (rev5)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev5)
URL : https://patchwork.freedesktop.org/series/59742/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Use local variable for SSEU info in GETPARAM ioctl Okay!
Commit: drm/i915: Add macro for SSEU stride calculation Okay!
Commit: drm/i915: Move calculation of subslices per slice to new function Okay!
Commit: drm/i915: Move sseu helper functions to intel_sseu.h Okay!
Commit: drm/i915: Remove inline from sseu helper functions Okay!
Commit: drm/i915: Expand subslice mask +drivers/gpu/drm/i915/i915_drv.c:460:24: warning: expression using sizeof(void)
_______________________________________________
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 (rev5)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev5)
URL : https://patchwork.freedesktop.org/series/59742/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6020 -> Patchwork_12917
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/59742/revisions/5/mbox/
Known issues
------------
Here are the changes found in Patchwork_12917 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_selftest@live_hangcheck:
- fi-bsw-kefka: [INCOMPLETE][1] -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6020/fi-bsw-kefka/igt@i915_selftest@live_hangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12917/fi-bsw-kefka/igt@i915_selftest@live_hangcheck.html
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [INCOMPLETE][3] ([fdo#107807]) -> [SKIP][4] ([fdo#109271])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6020/fi-kbl-guc/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12917/fi-kbl-guc/igt@[email protected]
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
Participating hosts (53 -> 45)
------------------------------
Additional (1): fi-pnv-d510
Missing (9): fi-kbl-soraka fi-cml-u2 fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6020 -> Patchwork_12917
CI_DRM_6020: 087f11254b9a7a79156a88509afc4c1e2d640a7f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4971: fc5e0467eb6913d21ad932aa8a31c77fdb5a9c77 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12917: 9b09ab1e44a390105863ff2ce8831bc537f6d9c9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
9b09ab1e44a3 drm/i915: Expand subslice mask2b9349156f64 drm/i915: Remove inline from sseu helper functions f03d45e541ca drm/i915: Move sseu helper functions to intel_sseu.h 1aa1a9b832aa drm/i915: Move calculation of subslices per slice to new function 5c73378a02c2 drm/i915: Add macro for SSEU stride calculation 2699899bf520 drm/i915: Use local variable for SSEU info in GETPARAM ioctl
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12917/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Refactor to expand subslice mask (rev6)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev6)
URL : https://patchwork.freedesktop.org/series/59742/
State : failure
== Summary ==
Applying: drm/i915: Use local variable for SSEU info in GETPARAM ioctl
Applying: drm/i915: Add macro for SSEU stride calculation
Applying: drm/i915: Move calculation of subslices per slice to new function
Applying: drm/i915: Move sseu helper functions to intel_sseu.h
Applying: drm/i915: Remove inline from sseu helper functions
Applying: drm/i915: Expand subslice mask
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_debugfs.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0006 drm/i915: Expand subslice mask
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for Refactor to expand subslice mask (rev6)
Quoted 5 lines · Patchwork
== Series Details ==
Series: Refactor to expand subslice mask (rev6)
URL : https://patchwork.freedesktop.org/series/59742/
State : failure
I'm not sure what happened here, but my assumption is that CI didn't like the fact that I sent a single update to the series without the entire series. I sent a fully rebased series (as of this morning) to trybot and had no issues. So I went ahead and sent an updated series to this list to trigger CI and push for review. Sorry for the spam!
-Stuart
Quoted 12 lines
== Summary ==
Applying: drm/i915: Use local variable for SSEU info in GETPARAM ioctl
Applying: drm/i915: Add macro for SSEU stride calculation
Applying: drm/i915: Move calculation of subslices per slice to new function
Applying: drm/i915: Move sseu helper functions tointel_sseu.h
Applying: drm/i915: Remove inline from sseu helper functions
Applying: drm/i915: Expand subslice mask
error: sha1 information is lacking or useless
Quoted 9 lines
(
drivers/gpu/drm/i915/i915_debugfs.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0006 drm/i915: Expand subslice mask When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am -- abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx