Skip to content

Commit d1913b8

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/ZnPiE4ROqBowa1nS@fedora
2 parents 07e0618 + d21d44d commit d1913b8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/xe/xe_guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,15 +631,15 @@ int xe_guc_enable_communication(struct xe_guc *guc)
631631
struct xe_device *xe = guc_to_xe(guc);
632632
int err;
633633

634-
guc_enable_irq(guc);
635-
636634
if (IS_SRIOV_VF(xe) && xe_device_has_memirq(xe)) {
637635
struct xe_gt *gt = guc_to_gt(guc);
638636
struct xe_tile *tile = gt_to_tile(gt);
639637

640638
err = xe_memirq_init_guc(&tile->sriov.vf.memirq, guc);
641639
if (err)
642640
return err;
641+
} else {
642+
guc_enable_irq(guc);
643643
}
644644

645645
xe_mmio_rmw32(guc_to_gt(guc), PMINTRMSK,

0 commit comments

Comments
 (0)