Skip to content

Commit

Permalink
drm/i915/xehpsdv: Add maximum sseu limits
Browse files Browse the repository at this point in the history
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 <matthew.d.roper@intel.com>
Reviewed-by: Caz Yokoyama <caz.yokoyama@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210729170008.2836648-10-matthew.d.roper@intel.com
  • Loading branch information
Matt Roper committed Aug 4, 2021
1 parent 05b78d2 commit eb962fa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion drivers/gpu/drm/i915/gt/intel_sseu.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ static void gen12_sseu_info_init(struct intel_gt *gt)
* across the entire device. Then calculate out the DSS for each
* workload type within that software slice.
*/
intel_sseu_set_info(sseu, 1, 6, 16);
if (IS_XEHPSDV(gt->i915))
intel_sseu_set_info(sseu, 1, 32, 16);
else
intel_sseu_set_info(sseu, 1, 6, 16);

/*
* As mentioned above, Xe_HP does not have the concept of a slice.
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/intel_sseu.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct intel_gt;
struct drm_printer;

#define GEN_MAX_SLICES (3) /* SKL upper bound */
#define GEN_MAX_SUBSLICES (8) /* ICL upper bound */
#define GEN_MAX_SUBSLICES (32) /* XEHPSDV 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)
#define GEN_MAX_EUS (16) /* TGL upper bound */
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static void cherryview_sseu_device_status(struct intel_gt *gt,
static void gen11_sseu_device_status(struct intel_gt *gt,
struct sseu_dev_info *sseu)
{
#define SS_MAX 6
#define SS_MAX 8
struct intel_uncore *uncore = gt->uncore;
const struct intel_gt_info *info = &gt->info;
u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];
Expand Down

0 comments on commit eb962fa

Please sign in to comment.