Commit 6f38589e authored by Jiadong Zhu's avatar Jiadong Zhu Committed by Alex Deucher
Browse files

drm/amdgpu/gfx9.4.3: remap queue after reset successfully 



Kiq command unmap_queues only does the dequeueing action.
We have to map the queue back with clean mqd.

Acked-by: default avatarVitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: default avatarJiadong Zhu <Jiadong.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5d0112f7

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

+27 −9
Original line number Diff line number Diff line
@@ -2080,7 +2080,7 @@ static int gfx_v9_4_3_xcc_kiq_init_queue(struct amdgpu_ring *ring, int xcc_id) 
	return 0;

}



static int gfx_v9_4_3_xcc_kcq_init_queue(struct amdgpu_ring *ring, int xcc_id)

static int gfx_v9_4_3_xcc_kcq_init_queue(struct amdgpu_ring *ring, int xcc_id, bool restore)

{

	struct amdgpu_device *adev = ring->adev;

	struct v9_mqd *mqd = ring->mqd_ptr;
@@ -2092,8 +2092,8 @@ static int gfx_v9_4_3_xcc_kcq_init_queue(struct amdgpu_ring *ring, int xcc_id) 
	 */

	tmp_mqd = (struct v9_mqd *)adev->gfx.mec.mqd_backup[mqd_idx];



	if (!tmp_mqd->cp_hqd_pq_control ||

	    (!amdgpu_in_reset(adev) && !adev->in_suspend)) {

	if (!restore && (!tmp_mqd->cp_hqd_pq_control ||

	    (!amdgpu_in_reset(adev) && !adev->in_suspend))) {

		memset((void *)mqd, 0, sizeof(struct v9_mqd_allocation));

		((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask = 0xFFFFFFFF;

		((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask = 0xFFFFFFFF;
@@ -2178,7 +2178,7 @@ static int gfx_v9_4_3_xcc_kcq_resume(struct amdgpu_device *adev, int xcc_id) 
			goto done;

		r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);

		if (!r) {

			r = gfx_v9_4_3_xcc_kcq_init_queue(ring, xcc_id);

			r = gfx_v9_4_3_xcc_kcq_init_queue(ring, xcc_id, false);

			amdgpu_bo_kunmap(ring->mqd_obj);

			ring->mqd_ptr = NULL;

		}
@@ -3455,11 +3455,29 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring, 
	if (r)

		return r;



	/* reset the ring */

	ring->wptr = 0;

	*ring->wptr_cpu_addr = 0;

	amdgpu_ring_clear_ring(ring);



	r = amdgpu_bo_reserve(ring->mqd_obj, false);

	if (unlikely(r != 0)){

		DRM_ERROR("fail to resv mqd_obj\n");

		return r;

	}

	r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);

	if (!r) {

		r = gfx_v9_4_3_xcc_kcq_init_queue(ring, ring->xcc_id, true);

		amdgpu_bo_kunmap(ring->mqd_obj);

		ring->mqd_ptr = NULL;

	}

	amdgpu_bo_unreserve(ring->mqd_obj);

	if (r){

		DRM_ERROR("fail to unresv mqd_obj\n");

		return r;

	}

	r = amdgpu_ring_alloc(kiq_ring, kiq->pmf->map_queues_size);

	kiq->pmf->kiq_map_queues(kiq_ring, ring);

	r = amdgpu_ring_test_ring(kiq_ring);

	if (r){

		DRM_ERROR("fail to remap queue\n");

		return r;

	}

	return amdgpu_ring_test_ring(ring);

}