Commit 04fd0739 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amdkfd: Fix static checker warning on MES queue type 



convert_to_mes_queue_type return can be negative, but
queue_input.queue_type is uint32_t. Put return in integer var and cast
to unsigned after negative check.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4b9caaa0

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q, 
	struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev->adev;

	struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev->adev;

	struct kfd_process_device *pdd = qpd_to_pdd(qpd);

	struct kfd_process_device *pdd = qpd_to_pdd(qpd);

	struct mes_add_queue_input queue_input;

	struct mes_add_queue_input queue_input;

	int r;

	int r, queue_type;





	if (dqm->is_hws_hang)

	if (dqm->is_hws_hang)

		return -EIO;

		return -EIO;
@@ -201,12 +201,13 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q, 
	queue_input.tba_addr = qpd->tba_addr;

	queue_input.tba_addr = qpd->tba_addr;

	queue_input.tma_addr = qpd->tma_addr;

	queue_input.tma_addr = qpd->tma_addr;





	queue_input.queue_type = convert_to_mes_queue_type(q->properties.type);

	queue_type = convert_to_mes_queue_type(q->properties.type);

	if (queue_input.queue_type < 0) {

	if (queue_type < 0) {

		pr_err("Queue type not supported with MES, queue:%d\n",

		pr_err("Queue type not supported with MES, queue:%d\n",

				q->properties.type);

				q->properties.type);

		return -EINVAL;

		return -EINVAL;

	}

	}

	queue_input.queue_type = (uint32_t)queue_type;





	if (q->gws) {

	if (q->gws) {

		queue_input.gws_base = 0;

		queue_input.gws_base = 0;