Commit 897240c2 authored by Tim Huang's avatar Tim Huang Committed by Zheng Zengkai
Browse files

drm/amdgpu: fix GRBM read timeout when do mes_self_test 

stable inclusion
from stable-v6.6.3
commit 553d26837568814821a78295a9d7ff3247d0df92
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LBQP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=553d26837568814821a78295a9d7ff3247d0df92



--------------------------------

commit 36e7ff5c13cb15cb7b06c76d42bb76cbf6b7ea75 upstream.

Use a proper MEID to make sure the CP_HQD_* and CP_GFX_HQD_* registers
can be touched when initialize the compute and gfx mqd in mes_self_test.
Otherwise, we expect no response from CP and an GRBM eventual timeout.

Signed-off-by: default avatarTim Huang <Tim.Huang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 1727cf5f

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

+16 −0
Original line number Diff line number Diff line
@@ -556,8 +556,20 @@ static void amdgpu_mes_queue_init_mqd(struct amdgpu_device *adev, 
	mqd_prop.hqd_queue_priority = p->hqd_queue_priority;

	mqd_prop.hqd_active = false;



	if (p->queue_type == AMDGPU_RING_TYPE_GFX ||

	    p->queue_type == AMDGPU_RING_TYPE_COMPUTE) {

		mutex_lock(&adev->srbm_mutex);

		amdgpu_gfx_select_me_pipe_q(adev, p->ring->me, p->ring->pipe, 0, 0, 0);

	}



	mqd_mgr->init_mqd(adev, q->mqd_cpu_ptr, &mqd_prop);



	if (p->queue_type == AMDGPU_RING_TYPE_GFX ||

	    p->queue_type == AMDGPU_RING_TYPE_COMPUTE) {

		amdgpu_gfx_select_me_pipe_q(adev, 0, 0, 0, 0, 0);

		mutex_unlock(&adev->srbm_mutex);

	}



	amdgpu_bo_unreserve(q->mqd_obj);

}
@@ -993,9 +1005,13 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, 
	switch (queue_type) {

	case AMDGPU_RING_TYPE_GFX:

		ring->funcs = adev->gfx.gfx_ring[0].funcs;

		ring->me = adev->gfx.gfx_ring[0].me;

		ring->pipe = adev->gfx.gfx_ring[0].pipe;

		break;

	case AMDGPU_RING_TYPE_COMPUTE:

		ring->funcs = adev->gfx.compute_ring[0].funcs;

		ring->me = adev->gfx.compute_ring[0].me;

		ring->pipe = adev->gfx.compute_ring[0].pipe;

		break;

	case AMDGPU_RING_TYPE_SDMA:

		ring->funcs = adev->sdma.instance[0].ring.funcs;