[PATCH] drm/xe: Fix unexpected backmerge results

[Lucas De Marchi]

On Tue, Apr 23, 2024 at 02:11:14PM GMT, Thomas Hellström wrote:
>The recent backmerge from drm-next to drm-xe-next brought with it
>some silent unexpected results. One code snippet was added twice
>and a partial revert was partially reverted. Fix that up to

"a partial revert was partially reverted" sounds like what was done was
correct.... what about "and a revert in drm-next got propagated by
mistake"?

>reinstate the code as it was before the backmerge.
>
>Fixes: 79790b6818e9 ("Merge drm/drm-next into drm-xe-next")
>Signed-off-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_vm.c       | 13 +++++++------
> drivers/gpu/drm/xe/xe_vm_types.h |  4 ++++
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
>index 85d6f359142d..7ae2b0300db6 100644
>--- a/drivers/gpu/drm/xe/xe_vm.c
>+++ b/drivers/gpu/drm/xe/xe_vm.c
>@@ -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;
>@@ -2100,6 +2095,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 +2293,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 +2439,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;
>diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
>index 7570c2c6c463..72a100671e5d 100644
>--- a/drivers/gpu/drm/xe/xe_vm_types.h
>+++ b/drivers/gpu/drm/xe/xe_vm_types.h
>@@ -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 */
>-- 
>2.44.0
>