Skip to content

Commit 90b75e1

Browse files
committed
drm/amdgpu: set default gfx reset masks for gfx6-8
These were not set so soft recovery was inadvertantly disabled. Fixes: 6ac55ea ("drm/amdgpu: move reset support type checks into the caller") Reviewed-by: Jesse Zhang <Jesse.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 1972763505d728c604b537180727ec8132e619df)
1 parent 6146a0f commit 90b75e1

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3102,6 +3102,11 @@ static int gfx_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
31023102
return r;
31033103
}
31043104

3105+
adev->gfx.gfx_supported_reset =
3106+
amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);
3107+
adev->gfx.compute_supported_reset =
3108+
amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);
3109+
31053110
return r;
31063111
}
31073112

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4399,6 +4399,11 @@ static int gfx_v7_0_sw_init(struct amdgpu_ip_block *ip_block)
43994399

44004400
gfx_v7_0_gpu_early_init(adev);
44014401

4402+
adev->gfx.gfx_supported_reset =
4403+
amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);
4404+
adev->gfx.compute_supported_reset =
4405+
amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);
4406+
44024407
return r;
44034408
}
44044409

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,11 @@ static int gfx_v8_0_sw_init(struct amdgpu_ip_block *ip_block)
20232023
if (r)
20242024
return r;
20252025

2026+
adev->gfx.gfx_supported_reset =
2027+
amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);
2028+
adev->gfx.compute_supported_reset =
2029+
amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);
2030+
20262031
return 0;
20272032
}
20282033

0 commit comments

Comments
 (0)