Skip to content

Commit eb962fa

Browse files
committed
drm/i915/xehpsdv: Add maximum sseu limits
Due to the removal of legacy slices and the transition to a gslice/cslice/mslice/etc. design, we'll internally store all DSS under "slice0." Signed-off-by: Matt Roper <[email protected]> Reviewed-by: Caz Yokoyama <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 05b78d2 commit eb962fa

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ static void gen12_sseu_info_init(struct intel_gt *gt)
145145
* across the entire device. Then calculate out the DSS for each
146146
* workload type within that software slice.
147147
*/
148-
intel_sseu_set_info(sseu, 1, 6, 16);
148+
if (IS_XEHPSDV(gt->i915))
149+
intel_sseu_set_info(sseu, 1, 32, 16);
150+
else
151+
intel_sseu_set_info(sseu, 1, 6, 16);
149152

150153
/*
151154
* As mentioned above, Xe_HP does not have the concept of a slice.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct intel_gt;
1616
struct drm_printer;
1717

1818
#define GEN_MAX_SLICES (3) /* SKL upper bound */
19-
#define GEN_MAX_SUBSLICES (8) /* ICL upper bound */
19+
#define GEN_MAX_SUBSLICES (32) /* XEHPSDV upper bound */
2020
#define GEN_SSEU_STRIDE(max_entries) DIV_ROUND_UP(max_entries, BITS_PER_BYTE)
2121
#define GEN_MAX_SUBSLICE_STRIDE GEN_SSEU_STRIDE(GEN_MAX_SUBSLICES)
2222
#define GEN_MAX_EUS (16) /* TGL upper bound */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static void cherryview_sseu_device_status(struct intel_gt *gt,
5353
static void gen11_sseu_device_status(struct intel_gt *gt,
5454
struct sseu_dev_info *sseu)
5555
{
56-
#define SS_MAX 6
56+
#define SS_MAX 8
5757
struct intel_uncore *uncore = gt->uncore;
5858
const struct intel_gt_info *info = &gt->info;
5959
u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

0 commit comments

Comments
 (0)