Commit 9c0d779f authored by Pallavi Mishra's avatar Pallavi Mishra Committed by Rodrigo Vivi
Browse files

drm/xe: Prevent return with locked vm 



Reorder vm_id check after the one for VISIBLE_VRAM. This should
prevent returning with locked vm in error scenario.

Signed-off-by: default avatarPallavi Mishra <pallavi.mishra@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 14ec2240

drivers/gpu/drm/xe/xe_bo.c

+11 −11
Original line number Diff line number Diff line
@@ -1795,17 +1795,6 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data, 
	if (XE_IOCTL_DBG(xe, args->size & ~PAGE_MASK))

		return -EINVAL;



	if (args->vm_id) {

		vm = xe_vm_lookup(xef, args->vm_id);

		if (XE_IOCTL_DBG(xe, !vm))

			return -ENOENT;

		err = xe_vm_lock(vm, &ww, 0, true);

		if (err) {

			xe_vm_put(vm);

			return err;

		}

	}



	if (args->flags & XE_GEM_CREATE_FLAG_DEFER_BACKING)

		bo_flags |= XE_BO_DEFER_BACKING;
@@ -1821,6 +1810,17 @@ int xe_gem_create_ioctl(struct drm_device *dev, void *data, 
		bo_flags |= XE_BO_NEEDS_CPU_ACCESS;

	}



	if (args->vm_id) {

		vm = xe_vm_lookup(xef, args->vm_id);

		if (XE_IOCTL_DBG(xe, !vm))

			return -ENOENT;

		err = xe_vm_lock(vm, &ww, 0, true);

		if (err) {

			xe_vm_put(vm);

			return err;

		}

	}



	bo = xe_bo_create(xe, NULL, vm, args->size, ttm_bo_type_device,

			  bo_flags);

	if (IS_ERR(bo)) {