Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 735f002b authored by yanyang1's avatar yanyang1 Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Add smc_sk firmware in baffin & ellesmere. 



add CGS_UCODE_ID_SMU_SK.

Signed-off-by: default avataryanyang1 <Young.Yang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92c6d645

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

+9 −3
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
{

	CGS_FUNC_ADEV;



	if (CGS_UCODE_ID_SMU != type) {

	if ((CGS_UCODE_ID_SMU != type) && (CGS_UCODE_ID_SMU_SK != type)) {

		uint64_t gpu_addr;

		uint32_t data_size;

		const struct gfx_firmware_header_v1_0 *header;
@@ -743,10 +743,16 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
			strcpy(fw_name, "amdgpu/fiji_smc.bin");

			break;

		case CHIP_BAFFIN:

			if (type == CGS_UCODE_ID_SMU)

				strcpy(fw_name, "amdgpu/baffin_smc.bin");

			else if (type == CGS_UCODE_ID_SMU_SK)

				strcpy(fw_name, "amdgpu/baffin_smc_sk.bin");

			break;

		case CHIP_ELLESMERE:

			if (type == CGS_UCODE_ID_SMU)

				strcpy(fw_name, "amdgpu/ellesmere_smc.bin");

			else if (type == CGS_UCODE_ID_SMU_SK)

				strcpy(fw_name, "amdgpu/ellesmere_smc_sk.bin");

			break;

		default:

			DRM_ERROR("SMC firmware not supported\n");

drivers/gpu/drm/amd/include/cgs_common.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ enum cgs_voltage_planes { 
 */

enum cgs_ucode_id {

	CGS_UCODE_ID_SMU = 0,

	CGS_UCODE_ID_SMU_SK,

	CGS_UCODE_ID_SDMA0,

	CGS_UCODE_ID_SDMA1,

	CGS_UCODE_ID_CP_CE,