Commit 1f006470 authored by Matt Roper's avatar Matt Roper Committed by Thomas Hellström

drm/xe/mcr: Avoid clobbering DSS steering

A couple copy/paste mistakes in the code that selects steering targets
for OADDRM and INSTANCE0 unintentionally clobbered the steering target
for DSS ranges in some cases.

The OADDRM/INSTANCE0 values were also not assigned as intended, although
that mistake wound up being harmless since the desired values for those
specific ranges were '0' which the kzalloc of the GT structure should
have already taken care of implicitly.

Fixes: dd08ebf6 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
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/20240626210536.1620176-2-matthew.d.roper@intel.com
(cherry picked from commit 4f82ac61)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent fc932f51
...@@ -342,7 +342,7 @@ static void init_steering_oaddrm(struct xe_gt *gt) ...@@ -342,7 +342,7 @@ static void init_steering_oaddrm(struct xe_gt *gt)
else else
gt->steering[OADDRM].group_target = 1; gt->steering[OADDRM].group_target = 1;
gt->steering[DSS].instance_target = 0; /* unused */ gt->steering[OADDRM].instance_target = 0; /* unused */
} }
static void init_steering_sqidi_psmi(struct xe_gt *gt) static void init_steering_sqidi_psmi(struct xe_gt *gt)
...@@ -357,8 +357,8 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt) ...@@ -357,8 +357,8 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt)
static void init_steering_inst0(struct xe_gt *gt) static void init_steering_inst0(struct xe_gt *gt)
{ {
gt->steering[DSS].group_target = 0; /* unused */ gt->steering[INSTANCE0].group_target = 0; /* unused */
gt->steering[DSS].instance_target = 0; /* unused */ gt->steering[INSTANCE0].instance_target = 0; /* unused */
} }
static const struct { static const struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment