Skip to content

Commit 0ffb1fd

Browse files
committed
drm/amdgpu: invert the logic in amdgpu_device_should_recover_gpu()
Rather than opting into GPU recovery support, default to on, and opt out if it's not working on a particular GPU. This avoids the need to add new asics to this list since this is a core feature. Reviewed-by: Evan Quan <[email protected]> Reviewed-by: Guchun Chen <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 4175c32 commit 0ffb1fd

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

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

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4450,34 +4450,24 @@ bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev)
44504450

44514451
if (amdgpu_gpu_recovery == -1) {
44524452
switch (adev->asic_type) {
4453-
case CHIP_BONAIRE:
4454-
case CHIP_HAWAII:
4455-
case CHIP_TOPAZ:
4456-
case CHIP_TONGA:
4457-
case CHIP_FIJI:
4458-
case CHIP_POLARIS10:
4459-
case CHIP_POLARIS11:
4460-
case CHIP_POLARIS12:
4461-
case CHIP_VEGAM:
4462-
case CHIP_VEGA20:
4463-
case CHIP_VEGA10:
4464-
case CHIP_VEGA12:
4465-
case CHIP_RAVEN:
4466-
case CHIP_ARCTURUS:
4467-
case CHIP_RENOIR:
4468-
case CHIP_NAVI10:
4469-
case CHIP_NAVI14:
4470-
case CHIP_NAVI12:
4471-
case CHIP_SIENNA_CICHLID:
4472-
case CHIP_NAVY_FLOUNDER:
4473-
case CHIP_DIMGREY_CAVEFISH:
4474-
case CHIP_BEIGE_GOBY:
4475-
case CHIP_VANGOGH:
4476-
case CHIP_ALDEBARAN:
4477-
case CHIP_YELLOW_CARP:
4478-
break;
4479-
default:
4453+
#ifdef CONFIG_DRM_AMDGPU_SI
4454+
case CHIP_VERDE:
4455+
case CHIP_TAHITI:
4456+
case CHIP_PITCAIRN:
4457+
case CHIP_OLAND:
4458+
case CHIP_HAINAN:
4459+
#endif
4460+
#ifdef CONFIG_DRM_AMDGPU_CIK
4461+
case CHIP_KAVERI:
4462+
case CHIP_KABINI:
4463+
case CHIP_MULLINS:
4464+
#endif
4465+
case CHIP_CARRIZO:
4466+
case CHIP_STONEY:
4467+
case CHIP_CYAN_SKILLFISH:
44804468
goto disabled;
4469+
default:
4470+
break;
44814471
}
44824472
}
44834473

0 commit comments

Comments
 (0)