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

drm/amdgpu/gfx12: adjust KGQ reset sequence 



Kernel gfx queues do not need to be reinitialized or
remapped after a reset.  Align with gfx11.

v2: preserve init and remap for MMIO case.

Reviewed-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 0a6d6ed6)
Cc: stable@vger.kernel.org
parent 3eb46fbb

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

+13 −10
Original line number Diff line number Diff line
@@ -5297,11 +5297,12 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, 
			       struct amdgpu_fence *timedout_fence)

{

	struct amdgpu_device *adev = ring->adev;

	bool use_mmio = false;

	int r;



	amdgpu_ring_reset_helper_begin(ring, timedout_fence);



	r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, false);

	r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, use_mmio);

	if (r) {

		dev_warn(adev->dev, "reset via MES failed and try pipe reset %d\n", r);

		r = gfx_v12_reset_gfx_pipe(ring);
@@ -5309,6 +5310,7 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, 
			return r;

	}



	if (use_mmio) {

		r = gfx_v12_0_kgq_init_queue(ring, true);

		if (r) {

			dev_err(adev->dev, "failed to init kgq\n");
@@ -5320,6 +5322,7 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, 
			dev_err(adev->dev, "failed to remap kgq\n");

			return r;

		}

	}



	return amdgpu_ring_reset_helper_end(ring, timedout_fence);

}