Skip to content

Commit 785c871

Browse files
mattropegregkh
authored andcommitted
drm/xe/mcr: Avoid clobbering DSS steering
[ Upstream commit 1f00647 ] 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: dd08ebf ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Matt Roper <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 4f82ac6) Signed-off-by: Thomas Hellström <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent ce78e1e commit 785c871

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/xe/xe_gt_mcr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ static void init_steering_oaddrm(struct xe_gt *gt)
315315
else
316316
gt->steering[OADDRM].group_target = 1;
317317

318-
gt->steering[DSS].instance_target = 0; /* unused */
318+
gt->steering[OADDRM].instance_target = 0; /* unused */
319319
}
320320

321321
static void init_steering_sqidi_psmi(struct xe_gt *gt)
@@ -330,8 +330,8 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt)
330330

331331
static void init_steering_inst0(struct xe_gt *gt)
332332
{
333-
gt->steering[DSS].group_target = 0; /* unused */
334-
gt->steering[DSS].instance_target = 0; /* unused */
333+
gt->steering[INSTANCE0].group_target = 0; /* unused */
334+
gt->steering[INSTANCE0].instance_target = 0; /* unused */
335335
}
336336

337337
static const struct {

0 commit comments

Comments
 (0)