Commit cfbce3bc authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-xe-fixes-2024-07-04' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



Driver Changes:
- One copy/paste mistake fix.
- One error path fix causing an error pointer dereference.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZoZ-wD66lgjiNh72@fedora
parents 4931c01b 1f006470

drivers/gpu/drm/xe/xe_gt_mcr.c

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static void init_steering_oaddrm(struct xe_gt *gt) 
	else

		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)
@@ -357,8 +357,8 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt) 


static void init_steering_inst0(struct xe_gt *gt)

{

	gt->steering[DSS].group_target = 0;		/* unused */

	gt->steering[DSS].instance_target = 0;		/* unused */

	gt->steering[INSTANCE0].group_target = 0;	/* unused */

	gt->steering[INSTANCE0].instance_target = 0;	/* unused */

}



static const struct {

drivers/gpu/drm/xe/xe_migrate.c

+4 −4
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ xe_migrate_update_pgtables(struct xe_migrate *m, 
						 GFP_KERNEL, true, 0);

			if (IS_ERR(sa_bo)) {

				err = PTR_ERR(sa_bo);

				goto err;

				goto err_bb;

			}



			ppgtt_ofs = NUM_KERNEL_PDE +
@@ -1385,7 +1385,7 @@ xe_migrate_update_pgtables(struct xe_migrate *m, 
					 update_idx);

	if (IS_ERR(job)) {

		err = PTR_ERR(job);

		goto err_bb;

		goto err_sa;

	}



	/* Wait on BO move */
@@ -1434,12 +1434,12 @@ xe_migrate_update_pgtables(struct xe_migrate *m, 


err_job:

	xe_sched_job_put(job);

err_sa:

	drm_suballoc_free(sa_bo, NULL);

err_bb:

	if (!q)

		mutex_unlock(&m->job_mutex);

	xe_bb_free(bb, NULL);

err:

	drm_suballoc_free(sa_bo, NULL);

	return ERR_PTR(err);

}