Commit 0e5b7a95 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: only set cp active field for kiq queue 



The mec ucode will set the CP_HQD_ACTIVE bit while the queue is mapped by
MAP_QUEUES packet. So we only need set cp active field for kiq queue.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 52055039

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

+5 −2
Original line number Diff line number Diff line
@@ -3337,7 +3337,10 @@ static int gfx_v10_0_compute_mqd_init(struct amdgpu_ring *ring) 
	tmp = REG_SET_FIELD(tmp, CP_HQD_IB_CONTROL, MIN_IB_AVAIL_SIZE, 3);

	mqd->cp_hqd_ib_control = tmp;



	/* activate the queue */

	/* map_queues packet doesn't need activate the queue,

	 * so only kiq need set this field.

	 */

	if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)

		mqd->cp_hqd_active = 1;



	return 0;

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

+5 −2
Original line number Diff line number Diff line
@@ -4558,7 +4558,10 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring) 
	mqd->cp_hqd_eop_wptr_mem = RREG32(mmCP_HQD_EOP_WPTR_MEM);

	mqd->cp_hqd_eop_dones = RREG32(mmCP_HQD_EOP_DONES);



	/* activate the queue */

	/* map_queues packet doesn't need activate the queue,

	 * so only kiq need set this field.

	 */

	if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)

		mqd->cp_hqd_active = 1;



	return 0;

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

+5 −2
Original line number Diff line number Diff line
@@ -3370,7 +3370,10 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring) 
	tmp = REG_SET_FIELD(tmp, CP_HQD_IB_CONTROL, MIN_IB_AVAIL_SIZE, 3);

	mqd->cp_hqd_ib_control = tmp;



	/* activate the queue */

	/* map_queues packet doesn't need activate the queue,

	 * so only kiq need set this field.

	 */

	if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)

		mqd->cp_hqd_active = 1;



	return 0;