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

Merge tag 'drm-xe-next-fixes-2023-12-26' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZYsbDPBLUiqDevLt@intel.com
parents 92242716 315acff5

drivers/gpu/drm/xe/xe_vm.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/xe/xe_wait_user_fence.c

+1 −0
Original line number Diff line number Diff line
@@ -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;