drm/amdgpu: put some case statments in family order (da87c30b) · Commits · 戴 / test

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

+27 −27

Original line number	Diff line number	Diff line
		@@ -1534,15 +1534,6 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
		adev->firmware.gpu_info_fw = NULL;

		switch (adev->asic_type) {
		case CHIP_TOPAZ:
		case CHIP_TONGA:
		case CHIP_FIJI:
		case CHIP_POLARIS10:
		case CHIP_POLARIS11:
		case CHIP_POLARIS12:
		case CHIP_VEGAM:
		case CHIP_CARRIZO:
		case CHIP_STONEY:
		#ifdef CONFIG_DRM_AMDGPU_SI
		case CHIP_VERDE:
		case CHIP_TAHITI:
		@@ -1557,6 +1548,15 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
		case CHIP_KABINI:
		case CHIP_MULLINS:
		#endif
		case CHIP_TOPAZ:
		case CHIP_TONGA:
		case CHIP_FIJI:
		case CHIP_POLARIS10:
		case CHIP_POLARIS11:
		case CHIP_POLARIS12:
		case CHIP_VEGAM:
		case CHIP_CARRIZO:
		case CHIP_STONEY:
		case CHIP_VEGA20:
		default:
		return 0;
		@@ -1690,24 +1690,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
		amdgpu_device_enable_virtual_display(adev);

		switch (adev->asic_type) {
		case CHIP_TOPAZ:
		case CHIP_TONGA:
		case CHIP_FIJI:
		case CHIP_POLARIS10:
		case CHIP_POLARIS11:
		case CHIP_POLARIS12:
		case CHIP_VEGAM:
		case CHIP_CARRIZO:
		case CHIP_STONEY:
		if (adev->flags & AMD_IS_APU)
		adev->family = AMDGPU_FAMILY_CZ;
		else
		adev->family = AMDGPU_FAMILY_VI;

		r = vi_set_ip_blocks(adev);
		if (r)
		return r;
		break;
		#ifdef CONFIG_DRM_AMDGPU_SI
		case CHIP_VERDE:
		case CHIP_TAHITI:
		@@ -1736,6 +1718,24 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
		return r;
		break;
		#endif
		case CHIP_TOPAZ:
		case CHIP_TONGA:
		case CHIP_FIJI:
		case CHIP_POLARIS10:
		case CHIP_POLARIS11:
		case CHIP_POLARIS12:
		case CHIP_VEGAM:
		case CHIP_CARRIZO:
		case CHIP_STONEY:
		if (adev->flags & AMD_IS_APU)
		adev->family = AMDGPU_FAMILY_CZ;
		else
		adev->family = AMDGPU_FAMILY_VI;

		r = vi_set_ip_blocks(adev);
		if (r)
		return r;
		break;
		case CHIP_VEGA10:
		case CHIP_VEGA12:
		case CHIP_VEGA20:

Admin message