diff options
| author |  Dave Airlie <airlied@redhat.com>
| 2024-06-21 11:59:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com>
| 2024-06-21 11:59:31 +1000 |
| commit | d1913b86f7351238106068785e9adc63d76d8790 (patch) | |
| tree | bccbf4bcf591551a407e3c484854fd0d4d6685e6 /drivers | |
| parent | Merge tag 'amd-drm-fixes-6.10-2024-06-19' of https://gitlab.freedesktop.org/a... (diff) | |
| parent | drm/xe/vf: Don't touch GuC irq registers if using memory irqs (diff) | |
| download | linux-d1913b86f7351238106068785e9adc63d76d8790.tar.gz linux-d1913b86f7351238106068785e9adc63d76d8790.tar.bz2 linux-d1913b86f7351238106068785e9adc63d76d8790.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 240e7a4bbff1..5faca4fc2fef 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -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, |