Skip to content

Commit dfd64f6

Browse files
committed
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: Timur Kristóf <timur.kristof@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 0a6d6ed) Cc: stable@vger.kernel.org
1 parent 3eb46fb commit dfd64f6

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5297,28 +5297,31 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring,
52975297
struct amdgpu_fence *timedout_fence)
52985298
{
52995299
struct amdgpu_device *adev = ring->adev;
5300+
bool use_mmio = false;
53005301
int r;
53015302

53025303
amdgpu_ring_reset_helper_begin(ring, timedout_fence);
53035304

5304-
r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, false);
5305+
r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, use_mmio);
53055306
if (r) {
53065307
dev_warn(adev->dev, "reset via MES failed and try pipe reset %d\n", r);
53075308
r = gfx_v12_reset_gfx_pipe(ring);
53085309
if (r)
53095310
return r;
53105311
}
53115312

5312-
r = gfx_v12_0_kgq_init_queue(ring, true);
5313-
if (r) {
5314-
dev_err(adev->dev, "failed to init kgq\n");
5315-
return r;
5316-
}
5313+
if (use_mmio) {
5314+
r = gfx_v12_0_kgq_init_queue(ring, true);
5315+
if (r) {
5316+
dev_err(adev->dev, "failed to init kgq\n");
5317+
return r;
5318+
}
53175319

5318-
r = amdgpu_mes_map_legacy_queue(adev, ring);
5319-
if (r) {
5320-
dev_err(adev->dev, "failed to remap kgq\n");
5321-
return r;
5320+
r = amdgpu_mes_map_legacy_queue(adev, ring);
5321+
if (r) {
5322+
dev_err(adev->dev, "failed to remap kgq\n");
5323+
return r;
5324+
}
53225325
}
53235326

53245327
return amdgpu_ring_reset_helper_end(ring, timedout_fence);

0 commit comments

Comments
 (0)