Skip to content

Commit 88ed07c

Browse files
dceraolomattrope
authored andcommitted
drm/i915/xehp: handle fused off CCS engines
HW resources are divided across the active CCS engines at the compute slice level, with each CCS having priority on one of the cslices. If a compute slice has no enabled DSS, its paired compute engine is not usable in full parallel execution because the other ones already fully saturate the HW, so consider it fused off. v2 (José): - moved it to its own function - fixed definition of ccs_mask v3 (Matt): - Replace fls() condition with a simple IP version test v4 (Matt): - Don't try to calculate a ccs_mask using intel_slicemask_from_dssmask() until we've determined that we're running on an Xe_HP platform where the logic makes sense (and won't overflow). Cc: Stuart Summers <stuart.summers@intel.com> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Stuart Summers <stuart.summers@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220302052008.1884985-1-matthew.d.roper@intel.com
1 parent e393e2a commit 88ed07c

3 files changed

Lines changed: 42 additions & 4 deletions

File tree

drivers/gpu/drm/i915/gt/intel_engine_cs.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,29 @@ bool gen11_vdbox_has_sfc(struct intel_gt *gt,
592592
return false;
593593
}
594594

595+
static void engine_mask_apply_compute_fuses(struct intel_gt *gt)
596+
{
597+
struct drm_i915_private *i915 = gt->i915;
598+
struct intel_gt_info *info = &gt->info;
599+
int ss_per_ccs = info->sseu.max_subslices / I915_MAX_CCS;
600+
unsigned long ccs_mask;
601+
unsigned int i;
602+
603+
if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50))
604+
return;
605+
606+
ccs_mask = intel_slicemask_from_dssmask(intel_sseu_get_compute_subslices(&info->sseu),
607+
ss_per_ccs);
608+
/*
609+
* If all DSS in a quadrant are fused off, the corresponding CCS
610+
* engine is not available for use.
611+
*/
612+
for_each_clear_bit(i, &ccs_mask, I915_MAX_CCS) {
613+
info->engine_mask &= ~BIT(_CCS(i));
614+
drm_dbg(&i915->drm, "ccs%u fused off\n", i);
615+
}
616+
}
617+
595618
/*
596619
* Determine which engines are fused off in our particular hardware.
597620
* Note that we have a catch-22 situation where we need to be able to access
@@ -673,6 +696,8 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)
673696
vebox_mask, VEBOX_MASK(gt));
674697
GEM_BUG_ON(vebox_mask != VEBOX_MASK(gt));
675698

699+
engine_mask_apply_compute_fuses(gt);
700+
676701
return info->engine_mask;
677702
}
678703

drivers/gpu/drm/i915/gt/intel_sseu.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,31 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu)
3232
return total;
3333
}
3434

35-
u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8 slice)
35+
static u32
36+
_intel_sseu_get_subslices(const struct sseu_dev_info *sseu,
37+
const u8 *subslice_mask, u8 slice)
3638
{
3739
int i, offset = slice * sseu->ss_stride;
3840
u32 mask = 0;
3941

4042
GEM_BUG_ON(slice >= sseu->max_slices);
4143

4244
for (i = 0; i < sseu->ss_stride; i++)
43-
mask |= (u32)sseu->subslice_mask[offset + i] <<
44-
i * BITS_PER_BYTE;
45+
mask |= (u32)subslice_mask[offset + i] << i * BITS_PER_BYTE;
4546

4647
return mask;
4748
}
4849

50+
u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8 slice)
51+
{
52+
return _intel_sseu_get_subslices(sseu, sseu->subslice_mask, slice);
53+
}
54+
55+
u32 intel_sseu_get_compute_subslices(const struct sseu_dev_info *sseu)
56+
{
57+
return _intel_sseu_get_subslices(sseu, sseu->compute_subslice_mask, 0);
58+
}
59+
4960
void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice,
5061
u8 *subslice_mask, u32 ss_mask)
5162
{

drivers/gpu/drm/i915/gt/intel_sseu.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ intel_sseu_subslice_total(const struct sseu_dev_info *sseu);
103103
unsigned int
104104
intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice);
105105

106-
u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8 slice);
106+
u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8 slice);
107+
108+
u32 intel_sseu_get_compute_subslices(const struct sseu_dev_info *sseu);
107109

108110
void intel_sseu_set_subslices(struct sseu_dev_info *sseu, int slice,
109111
u8 *subslice_mask, u32 ss_mask);

0 commit comments

Comments
 (0)