Commit d3a9fe45 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

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: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1e8b7062

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c

+8 −5
Original line number Diff line number Diff line
@@ -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 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) 
	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;

}