Skip to content
Snippets Groups Projects
Commit ed73f5f9 authored by Matt Roper's avatar Matt Roper Committed by Chromeos LUCI
Browse files

UPSTREAM: drm/i915: Correct ss -> steering calculation for pre-Xe_HP platforms


Accidental use of a "SLICE" macro where a "SUBSLICE" macro was intended
causes the group ID for steering to be calculated incorrectly on
pre-Xe_HP platforms.

Fixes: 9a92732f ("drm/i915/gt: Add general DSS steering iterator to intel_gt_mcr")
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220712220513.3451794-1-matthew.d.roper@intel.com


(cherry picked from commit a5e4a538)

BUG=b:242077859
TEST=i915 driver loaded successfully

Change-Id: I0c108f43ed667d28518ddcdc03d7eebab4f7f808
Signed-off-by: default avatarMohanram Meenakshisundaram <mohanram.meenakshisundaram@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3910567


Reviewed-by: default avatarRajat Jain <rajatja@google.com>
Reviewed-by: default avatarStéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Rajat Jain <rajatja@google.com>
Reviewed-by: default avatarDrew Davenport <ddavenport@chromium.org>
Tested-by: default avatarRajat Jain <rajatja@google.com>
parent fa5f7a6e
No related merge requests found
......@@ -515,7 +515,7 @@ void intel_gt_mcr_get_ss_steering(struct intel_gt *gt, unsigned int dss,
*group = dss / GEN_DSS_PER_GSLICE;
*instance = dss % GEN_DSS_PER_GSLICE;
} else {
*group = dss / GEN_MAX_HSW_SLICES;
*group = dss / GEN_MAX_SS_PER_HSW_SLICE;
*instance = dss % GEN_MAX_SS_PER_HSW_SLICE;
return;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment