Commit 2d30332a authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi

drm/xe/vm: tidy up xe_runtime_pm usage

The xe_device_mem_access_get() should be all that's needed here and
should now work as expected, without any strange races. In theory should
be no functional changes here.
Reported-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent a00b8f1a
...@@ -1245,11 +1245,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags) ...@@ -1245,11 +1245,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
INIT_LIST_HEAD(&vm->extobj.list); INIT_LIST_HEAD(&vm->extobj.list);
if (!(flags & XE_VM_FLAG_MIGRATION)) { if (!(flags & XE_VM_FLAG_MIGRATION))
/* We need to immeditatelly exit from any D3 state */
xe_pm_runtime_get(xe);
xe_device_mem_access_get(xe); xe_device_mem_access_get(xe);
}
vm_resv_obj = drm_gpuvm_resv_object_alloc(&xe->drm); vm_resv_obj = drm_gpuvm_resv_object_alloc(&xe->drm);
if (!vm_resv_obj) { if (!vm_resv_obj) {
...@@ -1360,10 +1357,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags) ...@@ -1360,10 +1357,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
err_no_resv: err_no_resv:
kfree(vm); kfree(vm);
if (!(flags & XE_VM_FLAG_MIGRATION)) { if (!(flags & XE_VM_FLAG_MIGRATION))
xe_device_mem_access_put(xe); xe_device_mem_access_put(xe);
xe_pm_runtime_put(xe);
}
return ERR_PTR(err); return ERR_PTR(err);
} }
...@@ -1522,7 +1517,6 @@ static void vm_destroy_work_func(struct work_struct *w) ...@@ -1522,7 +1517,6 @@ static void vm_destroy_work_func(struct work_struct *w)
if (!(vm->flags & XE_VM_FLAG_MIGRATION)) { if (!(vm->flags & XE_VM_FLAG_MIGRATION)) {
xe_device_mem_access_put(xe); xe_device_mem_access_put(xe);
xe_pm_runtime_put(xe);
if (xe->info.has_asid) { if (xe->info.has_asid) {
mutex_lock(&xe->usm.lock); mutex_lock(&xe->usm.lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment