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

Merge tag 'drm-xe-next-fixes-2024-05-02' of... 

Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

Driver Changes:
- Fix for a backmerge going slightly wrong.
- An UAF fix
- Avoid a WA error on LNL.

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZjOijQA43zhu3SZ4@fedora
parents 9f9039c6 3bc8848b

drivers/gpu/drm/xe/xe_vm.c

+10 −6
Original line number Diff line number Diff line
@@ -863,11 +863,6 @@ static void xe_vma_destroy_late(struct xe_vma *vma) 
		vma->ufence = NULL;

	}



	if (vma->ufence) {

		xe_sync_ufence_put(vma->ufence);

		vma->ufence = NULL;

	}



	if (xe_vma_is_userptr(vma)) {

		struct xe_userptr_vma *uvma = to_userptr_vma(vma);

		struct xe_userptr *userptr = &uvma->userptr;
@@ -1504,6 +1499,9 @@ static void xe_vm_free(struct drm_gpuvm *gpuvm) 
	/* xe_vm_close_and_put was not called? */

	xe_assert(xe, !vm->size);



	if (xe_vm_in_preempt_fence_mode(vm))

		flush_work(&vm->preempt.rebind_work);



	mutex_destroy(&vm->snap_mutex);



	if (!(vm->flags & XE_VM_FLAG_MIGRATION))
@@ -2100,6 +2098,10 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo, 
		struct xe_vma_op *op = gpuva_op_to_vma_op(__op);



		if (__op->op == DRM_GPUVA_OP_MAP) {

			op->map.immediate =

				flags & DRM_XE_VM_BIND_FLAG_IMMEDIATE;

			op->map.read_only =

				flags & DRM_XE_VM_BIND_FLAG_READONLY;

			op->map.is_null = flags & DRM_XE_VM_BIND_FLAG_NULL;

			op->map.dumpable = flags & DRM_XE_VM_BIND_FLAG_DUMPABLE;

			op->map.pat_index = pat_index;
@@ -2294,6 +2296,8 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, 
		switch (op->base.op) {

		case DRM_GPUVA_OP_MAP:

		{

			flags |= op->map.read_only ?

				VMA_CREATE_FLAG_READ_ONLY : 0;

			flags |= op->map.is_null ?

				VMA_CREATE_FLAG_IS_NULL : 0;

			flags |= op->map.dumpable ?
@@ -2438,7 +2442,7 @@ static int op_execute(struct drm_exec *exec, struct xe_vm *vm, 
	case DRM_GPUVA_OP_MAP:

		err = xe_vm_bind(vm, vma, op->q, xe_vma_bo(vma),

				 op->syncs, op->num_syncs,

				 !xe_vm_in_fault_mode(vm),

				 op->map.immediate || !xe_vm_in_fault_mode(vm),

				 op->flags & XE_VMA_OP_FIRST,

				 op->flags & XE_VMA_OP_LAST);

		break;

drivers/gpu/drm/xe/xe_vm_types.h

+4 −0
Original line number Diff line number Diff line
@@ -269,6 +269,10 @@ struct xe_vm { 
struct xe_vma_op_map {

	/** @vma: VMA to map */

	struct xe_vma *vma;

	/** @immediate: Immediate bind */

	bool immediate;

	/** @read_only: Read only */

	bool read_only;

	/** @is_null: is NULL binding */

	bool is_null;

	/** @dumpable: whether BO is dumped on GPU hang */

drivers/gpu/drm/xe/xe_wa.c

+1 −6
Original line number Diff line number Diff line
@@ -449,12 +449,7 @@ static const struct xe_rtp_entry_sr engine_was[] = { 
	  XE_RTP_RULES(GRAPHICS_VERSION(2004), FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(ROW_CHICKEN3, XE2_EUPEND_CHK_FLUSH_DIS))

	},

	{ XE_RTP_NAME("16021540221"),

	  XE_RTP_RULES(GRAPHICS_VERSION(2004), GRAPHICS_STEP(A0, B0),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(ROW_CHICKEN4, DISABLE_TDL_PUSH))

	},

	{ XE_RTP_NAME("18034896535"),

	{ XE_RTP_NAME("18034896535, 16021540221"), /* 16021540221: GRAPHICS_STEP(A0, B0) */

	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2004),

		       FUNC(xe_rtp_match_first_render_or_compute)),

	  XE_RTP_ACTIONS(SET(ROW_CHICKEN4, DISABLE_TDL_PUSH))