Commit b6dff005 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: make sure userqs are enabled in userq IOCTLs 



These IOCTLs shouldn't be called when userqs are not
enabled.  Make sure they are enabled before executing
the IOCTLs.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit d9675096)
Cc: stable@vger.kernel.org
parent 122b15cd

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

+16 −0
Original line number Diff line number Diff line
@@ -885,12 +885,28 @@ static int amdgpu_userq_input_args_validate(struct drm_device *dev, 
	return 0;

}



bool amdgpu_userq_enabled(struct drm_device *dev)

{

	struct amdgpu_device *adev = drm_to_adev(dev);

	int i;



	for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {

		if (adev->userq_funcs[i])

			return true;

	}



	return false;

}



int amdgpu_userq_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *filp)

{

	union drm_amdgpu_userq *args = data;

	int r;



	if (!amdgpu_userq_enabled(dev))

		return -ENOTSUPP;



	if (amdgpu_userq_input_args_validate(dev, args, filp) < 0)

		return -EINVAL;

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

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ uint64_t amdgpu_userq_get_doorbell_index(struct amdgpu_userq_mgr *uq_mgr, 
					     struct drm_file *filp);



u32 amdgpu_userq_get_supported_ip_mask(struct amdgpu_device *adev);

bool amdgpu_userq_enabled(struct drm_device *dev);



int amdgpu_userq_suspend(struct amdgpu_device *adev);

int amdgpu_userq_resume(struct amdgpu_device *adev);

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

+6 −0
Original line number Diff line number Diff line
@@ -471,6 +471,9 @@ int amdgpu_userq_signal_ioctl(struct drm_device *dev, void *data, 
	struct drm_exec exec;

	u64 wptr;



	if (!amdgpu_userq_enabled(dev))

		return -ENOTSUPP;



	num_syncobj_handles = args->num_syncobj_handles;

	syncobj_handles = memdup_user(u64_to_user_ptr(args->syncobj_handles),

				      size_mul(sizeof(u32), num_syncobj_handles));
@@ -653,6 +656,9 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, 
	int r, i, rentry, wentry, cnt;

	struct drm_exec exec;



	if (!amdgpu_userq_enabled(dev))

		return -ENOTSUPP;



	num_read_bo_handles = wait_info->num_bo_read_handles;

	bo_handles_read = memdup_user(u64_to_user_ptr(wait_info->bo_read_handles),

				      size_mul(sizeof(u32), num_read_bo_handles));