Commit 8760403e authored by Chengming Gui's avatar Chengming Gui Committed by Alex Deucher
Browse files

drm/amd/amdgpu: add sdma ip block for beige_goby 



Enable sdma block for beige_goby, same as sienna_cichlid

v2: share the same setting of sdma instance num with vangogh

Signed-off-by: default avatarChengming Gui <Jack.Gui@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Suggested-by: default avatarAlexander Deucher <Alexander.Deucher@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 898319ca

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

+1 −0
Original line number Diff line number Diff line
@@ -956,6 +956,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);

		amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);

		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

		amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block);

		break;

	default:

		return -EINVAL;

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

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
MODULE_FIRMWARE("amdgpu/sienna_cichlid_sdma.bin");

MODULE_FIRMWARE("amdgpu/navy_flounder_sdma.bin");

MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_sdma.bin");

MODULE_FIRMWARE("amdgpu/beige_goby_sdma.bin");



MODULE_FIRMWARE("amdgpu/vangogh_sdma.bin");
@@ -92,6 +93,7 @@ static void sdma_v5_2_init_golden_registers(struct amdgpu_device *adev) 
	case CHIP_NAVY_FLOUNDER:

	case CHIP_VANGOGH:

	case CHIP_DIMGREY_CAVEFISH:

	case CHIP_BEIGE_GOBY:

		break;

	default:

		break;
@@ -163,6 +165,9 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) 
	case CHIP_DIMGREY_CAVEFISH:

		chip_name = "dimgrey_cavefish";

		break;

	case CHIP_BEIGE_GOBY:

		chip_name = "beige_goby";

		break;

	default:

		BUG();

	}
@@ -1228,6 +1233,7 @@ static int sdma_v5_2_early_init(void *handle) 
		adev->sdma.num_instances = 2;

		break;

	case CHIP_VANGOGH:

	case CHIP_BEIGE_GOBY:

		adev->sdma.num_instances = 1;

		break;

	default:
@@ -1628,6 +1634,7 @@ static int sdma_v5_2_set_clockgating_state(void *handle, 
	case CHIP_NAVY_FLOUNDER:

	case CHIP_VANGOGH:

	case CHIP_DIMGREY_CAVEFISH:

	case CHIP_BEIGE_GOBY:

		sdma_v5_2_update_medium_grain_clock_gating(adev,

				state == AMD_CG_STATE_GATE);

		sdma_v5_2_update_medium_grain_light_sleep(adev,