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
v7: another rebase
v8: address review comments from Tvrtko and Daniele
v9: address review comments from Daniele
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: Refactor sseu helper functions
drm/i915: Expand subslice mask
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 24 ++- drivers/gpu/drm/i915/gt/intel_engine_types.h | 30 ++-- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 62 +++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 36 +++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 46 ++--- 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 | 176 +++++++++++-------- drivers/gpu/drm/i915/intel_device_info.h | 47 ----- 12 files changed, 281 insertions(+), 180 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.
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
@@ -329,6 +329,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;
@@ -382,12 +383,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 ;
@@ -404,7 +405,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);
@@ -454,12 +455,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.
v2: update headers in intel_sseu.h
v3: use GEN_SSEU_STRIDE for stride calculations in intel_sseu.h
apply s/bits/max_entries/ to GEN_SSEU_STRIDE parameter
--- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 ++ drivers/gpu/drm/i915/i915_query.c | 17 ++++++++--------- drivers/gpu/drm/i915/intel_device_info.h | 9 +++------ 3 files changed, 13 insertions(+), 15 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 (max_entries) DIV_ROUND_UP(max_entries, 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)))
drivers/gpu/drm/i915/intel_device_info.h +3 -6
@@ -231,8 +231,7 @@ static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu)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 subslice_stride =GEN_SSEU_STRIDE (sseu->max_eus_per_subslice);int slice_stride = sseu->max_subslices * subslice_stride;return slice * slice_stride + subslice * subslice_stride;
@@ -244,8 +243,7 @@ static inline u16 sseu_get_eus(const struct sseu_dev_info *sseu,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++) { +for (i =0 ; i <GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); i++) { eu_mask |= ((u16 ) sseu->eu_mask[offset + i]) << (i *BITS_PER_BYTE ); }
@@ -258,8 +256,7 @@ static inline void sseu_set_eus(struct sseu_dev_info *sseu, {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++) { +for (i =0 ; i <GEN_SSEU_STRIDE (sseu->max_eus_per_subslice); i++) { sseu->eu_mask[offset + i] = (eu_mask >> (BITS_PER_BYTE * i)) &0xff ; }
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
v3: add intel_* prefix to sseu_subslices_per_slice
--- 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 +intel_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
@@ -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,intel_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,intel_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,intel_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/5 drm/i915: Refactor sseu helper functions
In reply to Stuart SummersMove functions to intel_sseu.h and remove inline qualifier. Additionally, ensure these are all prefixed with intel_sseu_* to match the convention of other functions in i915.
v2: fix spacing from checkpatch warning
v3: squash helper function changes into a single patch
break 80 character line to fix checkpatch warning move get/set_eus helpers to intel_device_info.c
v4: Remove intel_ prefix from static functions in
intel_device_info.c and correctly copy changes to stride calculation in those functions.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 17 +++++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 10 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 60 +++++++++++++++++++----- drivers/gpu/drm/i915/intel_device_info.h | 44 ----------------- 6 files changed, 74 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +17 -0
@@ -8,6 +8,23 @@#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]); +} +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu) {
drivers/gpu/drm/i915/gt/intel_sseu.h +5 -5
@@ -63,11 +63,11 @@ intel_sseu_from_device_info(const struct sseu_dev_info *sseu)return value; } -static inline unsigned int -intel_sseu_subslices_per_slice (const struct sseu_dev_info *sseu,u8 slice) -{ -return hweight8 (sseu->subslice_mask[slice]); -} +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);u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -4164,7 +4164,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++) {
@@ -4188,7 +4188,7 @@ 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,intel_sseu_subslices_per_slice (sseu, s));
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -383,7 +383,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 +49 -11
111 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +0 -44
50 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
v3: update headers in intel_sseu.h
v4: add const to some sseu_dev_info variables
use sseu->eu_stride for EU stride calculations
v5: address review comments from Tvrtko and Daniele
v6: remove extra space in intel_sseu_get_subslices
return the correct subslice enable in for_each_instdone add GEM_BUG_ON to ensure user doesn't pass invalid ss_mask size use printk formatted string for subslice mask
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 24 +++- drivers/gpu/drm/i915/gt/intel_engine_types.h | 30 ++--- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 47 ++++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 28 ++++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 40 +++--- 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 | 122 +++++++++---------- 11 files changed, 201 insertions(+), 116 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +22 -2
@@ -910,12 +910,30 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +static inline u32 +intel_sseu_fls_subslice (const struct sseu_dev_info *sseu,u32 slice) +{ +u32 subslice; +int i; + +for (i = sseu->ss_stride -1 ; i >=0 ; i--) { + subslice =fls (sseu->subslice_mask[slice * sseu->ss_stride + + i]); +if (subslice) { + subslice += i *BITS_PER_BYTE ; +break ; + } + } + +return subslice; +} +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 =intel_sseu_fls_subslice (sseu, slice);if (IS_GEN (dev_priv,10 )) mcr_s_ss_select = GEN8_MCR_SLICE(slice) |
@@ -991,6 +1009,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;
@@ -1008,7 +1027,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 +15 -15
@@ -534,20 +534,20 @@ 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 & BIT(subslice__)) : \ + intel_sseu_has_subslice(sseu__, slice__, 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
@@ -51,6 +51,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;
@@ -72,7 +73,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 +46 -1
62 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_sseu.h +27 -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 (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;
@@ -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,33 @@ 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 = sseu->subslice_mask[slice * sseu->ss_stride + + subslice /BITS_PER_BYTE ]; + +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); +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); + +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); +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
@@ -767,7 +767,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]; +u32 ss_mask =intel_sseu_get_subslices (sseu, slice);u8 enabled_mask = (ss_mask | ss_mask >>GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ;
drivers/gpu/drm/i915/i915_debugfs.c +21 -19
@@ -1259,6 +1259,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;
@@ -1274,11 +1275,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,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;
@@ -4123,18 +4124,21 @@ 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]; +intel_sseu_copy_subslices (&info->sseu, s, + 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 +4155,23 @@ 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++) +intel_sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask); 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); }
@@ -4216,6 +4218,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 +4226,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; +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, wakeref) {if (IS_CHERRYVIEW (dev_priv))
drivers/gpu/drm/i915/i915_drv.c +4 -2
@@ -331,7 +331,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,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; +int value =0 ;switch (param->param) {case I915_PARAM_IRQ_ACTIVE :
@@ -460,7 +460,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 slice */ +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
@@ -408,6 +408,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;
@@ -423,12 +424,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 +56 -66
282 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 (rev9)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev9)
URL : https://patchwork.freedesktop.org/series/59742/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 4475a01ca163 drm/i915: Use local variable for SSEU info in GETPARAM ioctl 5bdea443d9df drm/i915: Add macro for SSEU stride calculation a38d3b81273b drm/i915: Move calculation of subslices per slice to new function 9aa78d4fdd9e drm/i915: Refactor sseu helper functions a10b5645e5d4 drm/i915: Expand subslice mask -:113: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice__' - possible side-effects? #113: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:541: +#define instdone_has_subslice(dev_priv__, sseu__, slice__, subslice__) \ + (IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \ + intel_sseu_has_subslice(sseu__, slice__, subslice__))
-:117: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv_' - possible side-effects? #117: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:545:
+#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_)))
-:117: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'sseu_' - possible side-effects? #117: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:545:
+#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_)))
-:117: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'slice_' - possible side-effects? #117: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:545:
+#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_)))
-:117: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'subslice_' - possible side-effects? #117: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:545:
+#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, 686 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 (rev9)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev9)
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: Refactor sseu helper functions
Okay!
Commit: drm/i915: Expand subslice mask +drivers/gpu/drm/i915/i915_drv.c:465: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 (rev9)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev9)
URL : https://patchwork.freedesktop.org/series/59742/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6077 -> Patchwork_13011
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/
Known issues
------------
Here are the changes found in Patchwork_13011 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/fi-blb-e6850/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/fi-blb-e6850/igt@[email protected]
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
Participating hosts (53 -> 41)
------------------------------
Missing (12): fi-kbl-soraka fi-kbl-7567u fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-byt-clapper fi-icl-u3 fi-icl-y fi-icl-dsi fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6077 -> Patchwork_13011
CI_DRM_6077: f175074b17cfeb7d64cfcfd6b2641641a10d4deb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4984: 66c887d2f7a92a4a97acd9611d5342afc5d4f815 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13011: a10b5645e5d40c83f76dfbfbfb7a2a26b889f661 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a10b5645e5d4 drm/i915: Expand subslice mask9aa78d4fdd9e drm/i915: Refactor sseu helper functions a38d3b81273b drm/i915: Move calculation of subslices per slice to new function 5bdea443d9df drm/i915: Add macro for SSEU stride calculation 4475a01ca163 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_13011/
_______________________________________________
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 (rev9)
In reply to Stuart Summers== Series Details ==
== Series Details ==
Series: Refactor to expand subslice mask (rev9)
URL : https://patchwork.freedesktop.org/series/59742/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6077_full -> Patchwork_13011_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13011_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_cursor_crc@pipe-a-cursor-suspend}:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-apl2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-apl7/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_13011_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_softpin@softpin:
- shard-snb: [PASS][3] -> [INCOMPLETE][4] ([fdo#105411])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-snb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-snb1/igt@[email protected]
* igt@i915_pm_rpm@gem-idle:
- shard-skl: [PASS][5] -> [INCOMPLETE][6] ([fdo#107807]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl7/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl8/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-apl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-apl6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-apl4/igt@[email protected]
* igt@tools_test@tools_test:
- shard-hsw: [PASS][9] -> [SKIP][10] ([fdo#109271])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-hsw5/igt@tools_test@tools_test.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-hsw6/igt@tools_test@tools_test.html
#### Possible fixes ####
* igt@i915_pm_rpm@i2c:
- shard-skl: [INCOMPLETE][11] ([fdo#107807]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl3/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-apl: [FAIL][13] ([fdo#102250]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-apl6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-apl2/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [DMESG-WARN][15] ([fdo#108566]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-apl5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-apl5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][17] ([fdo#109507]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl4/igt@[email protected]
* igt@kms_flip_tiling@flip-changes-tiling-y:
- shard-skl: [FAIL][19] ([fdo#107931] / [fdo#108303]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][21] ([fdo#108145] / [fdo#110403]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl2/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@gem-execbuf-stress-pc8:
- shard-skl: [SKIP][23] ([fdo#109271]) -> [INCOMPLETE][24] ([fdo#107807])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6077/shard-skl3/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13011/shard-skl6/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102250]: https://bugs.freedesktop.org/show_bug.cgi?id=102250
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107931]: https://bugs.freedesktop.org/show_bug.cgi?id=107931
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
Participating hosts (10 -> 8)
------------------------------
Missing (2): pig-skl-6260u shard-iclb
Build changes
-------------
* Linux: CI_DRM_6077 -> Patchwork_13011
CI_DRM_6077: f175074b17cfeb7d64cfcfd6b2641641a10d4deb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4984: 66c887d2f7a92a4a97acd9611d5342afc5d4f815 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13011: a10b5645e5d40c83f76dfbfbfb7a2a26b889f661 @ 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_13011/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Expand subslice mask
In reply to Stuart Summers<snip>
drivers/gpu/drm/i915/gt/intel_sseu.h line 12
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_sseu.h +1
-0@@ -9,16 +9,18 @@#include <linux/types.h> #include <linux/kernel.h> +#include <linux/string.h>
AFAICS this header is not needed anymore. With it removed:
Daniele
Quoted 574 lines
drivers/gpu/drm/i915/gt/intel_sseu.h +26
-1struct 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;@@ -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,33 @@ 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 = sseu->subslice_mask[slice * sseu->ss_stride + + subslice /BITS_PER_BYTE ]; + +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); +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); + +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); +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -767,7 +767,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]; +u32 ss_mask =intel_sseu_get_subslices (sseu, slice);u8 enabled_mask = (ss_mask | ss_mask >>GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ;drivers/gpu/drm/i915/i915_debugfs.c +21
-19@@ -1259,6 +1259,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;@@ -1274,11 +1275,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,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;@@ -4123,18 +4124,21 @@ 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]; +intel_sseu_copy_subslices (&info->sseu, s, + 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 +4155,23 @@ 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++) +intel_sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask); 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); }@@ -4216,6 +4218,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 +4226,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; +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, wakeref) {if (IS_CHERRYVIEW (dev_priv))drivers/gpu/drm/i915/i915_drv.c +4
-2@@ -331,7 +331,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data,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; +int value =0 ;switch (param->param) {case I915_PARAM_IRQ_ACTIVE :@@ -460,7 +460,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 slice */ +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@@ -408,6 +408,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;@@ -423,12 +424,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 +51
-66@@ -92,9 +92,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);@@ -117,10 +117,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,@@ -129,7 +128,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 ); }@@ -142,7 +141,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 ; }@@ -159,9 +158,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);@@ -190,15 +189,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 );@@ -207,15 +201,15 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)for (s =0 ; s < sseu->max_slices; s++) {if (s_en &BIT (s)) { -int ss_idx = sseu->max_subslices * s;int ss; sseu->slice_mask |=BIT (s); - sseu->subslice_mask[s] = (ss_en >> ss_idx) & ss_en_mask; -for (ss =0 ; ss < sseu->max_subslices; ss++) { -if (sseu->subslice_mask[s] &BIT (ss)) + +intel_sseu_set_subslices (sseu, s, ss_en_mask); + +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);@@ -235,23 +229,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 ) >> -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 );@@ -276,14 +257,22 @@ 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++) {for (ss =0 ; ss < sseu->max_subslices; ss++) {if (sseu_get_eus (sseu, s, ss) ==0 ) - sseu->subslice_mask[s] &= ~BIT (ss); + subslice_mask &= ~BIT (ss); } + +/* +* Slice0 can have up to 3 subslices, but there are only 2 in +* slice1/2. +*/ +intel_sseu_set_subslices (sseu, s, s ==0 ? subslice_mask : + subslice_mask &0x3 ); } sseu->eu_total =compute_eu_total (sseu);@@ -309,13 +298,12 @@ 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; 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 =@@ -324,7 +312,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); }@@ -335,10 +323,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); } +intel_sseu_set_subslices (sseu,0 , subslice_mask); + sseu->eu_total =compute_eu_total (sseu);/* @@ -371,9 +361,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 @@ -392,14 +381,14 @@ 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++) {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 ;@@ -472,9 +461,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 @@ -501,18 +488,19 @@ 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;u32 n_disabled; -if (!(sseu->subslice_mask[s] &BIT (ss))) +if (!intel_sseu_has_subslice (sseu, s, ss))/* skip disabled subslice */ continue ; eu_disabled_mask = - eu_disable[s] >> (ss * sseu->max_eus_per_subslice); + eu_disable[s] >> + (ss * sseu->max_eus_per_subslice);sseu_set_eus (sseu, s, ss, ~eu_disabled_mask);@@ -552,6 +540,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;int s, ss; +u32 subslice_mask;/* * There isn't a register to tell us how many slices/subslices. We @@ -563,22 +552,18 @@ 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 ; } - 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 :@@ -595,9 +580,14 @@ 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; +
drivers/gpu/drm/i915/intel_device_info.c static void haswell_sseu_info_init(struct drm_i915_private *dev_priv) · line 593
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +5
-0+intel_sseu_set_info (sseu,hweight8 (sseu->slice_mask), +hweight8 (subslice_mask), + sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) { +intel_sseu_set_subslices (sseu, s, subslice_mask); +for (ss =0 ; ss < sseu->max_subslices; ss++) {sseu_set_eus (sseu, s, ss, (1UL << sseu->eu_per_subslice) -1 );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Expand subslice mask
Quoted 6 lines · Daniele Ceraolo Spurio
<snip>
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_sseu.h +0
-0@@ -9,16 +9,18 @@
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_sseu.h line 12
Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_sseu.h +1
-0#include <linux/types.h> #include <linux/kernel.h> +#include <linux/string.h> AFAICS this header is not needed anymore. With it removed:
Reviewed-by Daniele Ceraolo Spurio <[email protected]>
Thanks for the review!
I do not believe I have push rights to drm-tip at this point. Can you help with merging this series?
Thanks,
Stuart
Quoted 667 lines
Daniele
Quoted 664 lines
drivers/gpu/drm/i915/gt/intel_sseu.h +5
-1struct 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;@@ -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.drivers/gpu/drm/i915/gt/intel_sseu.h +14
-0@@ -63,12 +68,33 @@ 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 = sseu->subslice_mask[slice * sseu->ss_stride + + subslice /BITS_PER_BYTE ]; + +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); +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,
drivers/gpu/drm/i915/gt/intel_sseu.h +3
-0+ u8 *to_mask); + +u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8slice);
drivers/gpu/drm/i915/gt/intel_sseu.h +2
-0+ +void intel_sseu_set_subslices(struct sseu_dev_info *sseu, intslice,
drivers/gpu/drm/i915/gt/intel_sseu.h +2
-0+ u32 ss_mask); +u32 intel_sseu_make_rpcs (struct drm_i915_private *i915,const struct intel_sseu *req_sseu);drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -767,7 +767,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]; +u32 ss_mask =intel_sseu_get_subslices (sseu, slice);u8
enabled_mask= (ss_mask|ss_mask>>
GEN10_L3BANK_PAIR_COUNT) &GEN10_L3BANK_MASK;drivers/gpu/drm/i915/i915_debugfs.c +3
-2@@ -1259,6 +1259,7 @@ static void i915_instdone_info(structdrm_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;@@ -1274,11 +1275,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-Quoted 1 line
row[slice][subslice]);
}
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -4072,7 +4073,7 @@ static void gen10_sseu_device_status(structdrm_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;drivers/gpu/drm/i915/i915_debugfs.c +6
-3@@ -4123,18 +4124,21 @@ 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]; +intel_sseu_copy_subslices (&info->sseu, s, + 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] &drivers/gpu/drm/i915/i915_debugfs.c +5
-8@@ -4151,25 +4155,23 @@ static void gen9_sseu_device_status(structdrm_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++) +intel_sseu_copy_subslices (&info->sseu, s, + sseu->subslice_mask); 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)-Quoted 1 line
sseu.subslice_7eu[s];
drivers/gpu/drm/i915/i915_debugfs.c +6
-5+u8 subslice_7eu = info->sseu.subslice_7eu[s]; sseu->eu_total -=hweight8 (subslice_7eu); }@@ -4216,6 +4218,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 +4226,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; +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, wakeref) { if (IS_CHERRYVIEW(dev_priv))drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -331,7 +331,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, 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; +int value =0 ;switch (param->param) { case I915_PARAM_IRQ_ACTIVE:drivers/gpu/drm/i915/i915_drv.c +3
-1@@ -460,7 +460,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 slice */ +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 +1
-0@@ -408,6 +408,7 @@ static void print_error_buffers(structdrm_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;drivers/gpu/drm/i915/i915_gpu_error.c +2
-2@@ -423,12 +424,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 +0
-2@@ -37,8 +37,6 @@ static int query_topology_info(structdrm_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)drivers/gpu/drm/i915/i915_query.c +2
-2@@ -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;drivers/gpu/drm/i915/i915_query.c +2
-2@@ -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 +2
-2@@ -92,9 +92,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);drivers/gpu/drm/i915/intel_device_info.c +2
-3@@ -117,10 +117,9 @@ void intel_device_info_dump_runtime(conststruct 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,drivers/gpu/drm/i915/intel_device_info.c +1
-1@@ -129,7 +128,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); }drivers/gpu/drm/i915/intel_device_info.c +1
-1@@ -142,7 +141,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; }drivers/gpu/drm/i915/intel_device_info.c +2
-2@@ -159,9 +158,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);drivers/gpu/drm/i915/intel_device_info.c +4
-9@@ -190,15 +189,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);drivers/gpu/drm/i915/intel_device_info.c +5
-4@@ -207,15 +201,15 @@ static void gen11_sseu_info_init(struct drm_i915_private *dev_priv)for (s =0 ; s < sseu->max_slices; s++) {if (s_en &BIT (s)) { -int ss_idx = sseu->max_subslices * s;int ss; sseu->slice_mask |=BIT (s); - sseu->subslice_mask[s] = (ss_en >> ss_idx) & ss_en_mask; -for (ss =0 ; ss < sseu->max_subslices; ss++) { -if (sseu->subslice_mask[s] &BIT (ss)) + +intel_sseu_set_subslices (sseu, s, ss_en_mask); + +for (ss =0 ; ss < sseu->max_subslices; ss++) +if (intel_sseu_has_subslice (sseu, s, ss)) sseu_set_eus(sseu, s, ss,
eu_en);drivers/gpu/drm/i915/intel_device_info.c +2
-16- } } } sseu->eu_per_subslice =hweight8 (eu_en);@@ -235,23 +229,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 ) >> -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);drivers/gpu/drm/i915/intel_device_info.c +0
-1@@ -276,14 +257,22 @@ 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
drivers/gpu/drm/i915/intel_device_info.c +8
-3-* 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++) {for (ss =0 ; ss < sseu->max_subslices; ss++) {if (sseu_get_eus (sseu, s, ss) ==0 ) - sseu->subslice_mask[s] &= ~BIT (ss); + subslice_mask &= ~BIT (ss); } + +/* +* Slice0 can have up to 3 subslices, but there are only 2 in
drivers/gpu/drm/i915/intel_device_info.c +3
-0+* slice1/2. +*/ + intel_sseu_set_subslices(sseu, s, s == 0 ?
subslice_mask:drivers/gpu/drm/i915/intel_device_info.c +1
-0+ subslice_mask &
0x3);
}sseu->eu_total = compute_eu_total(sseu);drivers/gpu/drm/i915/intel_device_info.c +2
-3@@ -309,13 +298,12 @@ 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; 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=drivers/gpu/drm/i915/intel_device_info.c +4
-2@@ -324,7 +312,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); }@@ -335,10 +323,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); } +intel_sseu_set_subslices (sseu,0 , subslice_mask); + sseu->eu_total =compute_eu_total (sseu);/*
drivers/gpu/drm/i915/intel_device_info.c +2
-3@@ -371,9 +361,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 appliesdrivers/gpu/drm/i915/intel_device_info.c +3
-5@@ -392,14 +381,14 @@ 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++) {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 ;@@ -472,9 +461,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 appliesdrivers/gpu/drm/i915/intel_device_info.c +4
-3@@ -501,18 +488,19 @@ 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;u32 n_disabled; -if (!(sseu->subslice_mask[s] &BIT (ss))) +if (!intel_sseu_has_subslice (sseu, s, ss))/* skip disabled subslice */ continue ; eu_disabled_mask = - eu_disable[s] >> (ss * sseu- >max_eus_per_subslice); + eu_disable[s] >> + (ss * sseu- >max_eus_per_subslice);sseu_set_eus(sseu, s, ss, ~eu_disabled_mask);drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -552,6 +540,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;int s, ss; +u32 subslice_mask;/* * There isn't a register to tell us how many slices/subslices.
Wedrivers/gpu/drm/i915/intel_device_info.c +3
-7@@ -563,22 +552,18 @@ 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 ; } - 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:
drivers/gpu/drm/i915/intel_device_info.c +4
-1@@ -595,9 +580,14 @@ 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 (subslice_mask), + sseu->eu_per_subslice);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c +2
-0for (s =0 ; s < sseu->max_slices; s++) { +intel_sseu_set_subslices (sseu, s, subslice_mask); +for (ss =0 ; ss < sseu->max_subslices; ss++) { sseu_set_eus(sseu, s, ss,(1UL <<
sseu->eu_per_subslice) -
1);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx