diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-01-03 11:31:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-01-03 11:32:07 +1000 |
| commit | cff601b45723f9a1415a6599fc24e073a7295cef (patch) | |
| tree | 3ccc948a5d2e2bf96d576dbdb1c5971ccba2a736 | |
| parent | 92242716ee92d2aa3c38c736b53d8910d443566d (diff) | |
| parent | 315acff5196f4e2f84a2a2d093000e0c6b0b4d1c (diff) | |
Merge tag 'drm-xe-next-fixes-2023-12-26' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
- Fix couple unfined behavior cases to calm UBSAN and clang (Matt Brost, Lucas)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZYsbDPBLUiqDevLt@intel.com
| -rw-r--r-- | drivers/gpu/drm/xe/xe_vm.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wait_user_fence.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 9180f2d2d71d..0cfe7289b97e 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -279,6 +279,9 @@ static int add_preempt_fences(struct xe_vm *vm, struct xe_bo *bo) struct xe_exec_queue *q; int err; + if (!vm->preempt.num_exec_queues) + return 0; + err = xe_bo_lock(bo, true); if (err) return err; diff --git a/drivers/gpu/drm/xe/xe_wait_user_fence.c b/drivers/gpu/drm/xe/xe_wait_user_fence.c index b0a7896f7fcb..a75eeba7bfe5 100644 --- a/drivers/gpu/drm/xe/xe_wait_user_fence.c +++ b/drivers/gpu/drm/xe/xe_wait_user_fence.c @@ -46,6 +46,7 @@ static int do_compare(u64 addr, u64 value, u64 mask, u16 op) break; default: XE_WARN_ON("Not possible"); + return -EINVAL; } return passed ? 0 : 1; |