drm/amdgpu/userq: use pm_runtime_resume_and_get and fix err handling

Use pm_runtime_resume_and_get instead of pm_runtime_get_sync as it
return error but put the reference in the function itself.

In goto statements we need to drop the pm reference too.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 87b0d291859aa98c78bf9a8f24ca812976bc6826..6f328742ef68341c45723980f5bcd307e4078eb9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -736,10 +736,9 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
        if (r)
                return r;
 
-       r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
+       r = pm_runtime_resume_and_get(adev_to_drm(adev)->dev);
        if (r < 0) {
-               drm_file_err(uq_mgr->file, "pm_runtime_get_sync() failed for userqueue create\n");
-               pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+               drm_file_err(uq_mgr->file, "pm_runtime_resume_and_get() failed for userqueue create\n");
                return r;
        }
 
@@ -747,13 +746,15 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
        if (!uq_funcs) {
                drm_file_err(uq_mgr->file, "Usermode queue is not supported for this IP (%u)\n",
                             args->in.ip_type);
-               return -EINVAL;
+               r = -EINVAL;
+               goto err_pm_runtime;
        }
 
        queue = kzalloc_obj(struct amdgpu_usermode_queue);
        if (!queue) {
                drm_file_err(uq_mgr->file, "Failed to allocate memory for queue\n");
-               return -ENOMEM;
+               r = -ENOMEM;
+               goto err_pm_runtime;
        }
 
        INIT_LIST_HEAD(&queue->userq_va_list);
@@ -867,6 +868,8 @@ clean_mapping:
        amdgpu_bo_unreserve(fpriv->vm.root.bo);
 free_queue:
        kfree(queue);
+err_pm_runtime:
+       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
        return r;
 }