Commit d1913b86 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Driver Changes:
- Fix for invalid register access

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZnPiE4ROqBowa1nS@fedora
parents 07e06189 d21d44db

drivers/gpu/drm/xe/xe_guc.c

+2 −2
Original line number Diff line number Diff line
@@ -631,8 +631,6 @@ int xe_guc_enable_communication(struct xe_guc *guc) 
	struct xe_device *xe = guc_to_xe(guc);

	int err;



	guc_enable_irq(guc);



	if (IS_SRIOV_VF(xe) && xe_device_has_memirq(xe)) {

		struct xe_gt *gt = guc_to_gt(guc);

		struct xe_tile *tile = gt_to_tile(gt);
@@ -640,6 +638,8 @@ int xe_guc_enable_communication(struct xe_guc *guc) 
		err = xe_memirq_init_guc(&tile->sriov.vf.memirq, guc);

		if (err)

			return err;

	} else {

		guc_enable_irq(guc);

	}



	xe_mmio_rmw32(guc_to_gt(guc), PMINTRMSK,