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

Commit c8172625 authored by rezhu's avatar rezhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: add smu support for ellesmere/baffin 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b304ac83

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

+9 −2
Original line number Diff line number Diff line
@@ -681,9 +681,10 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type) 
		result = AMDGPU_UCODE_ID_CP_MEC1;

		break;

	case CGS_UCODE_ID_CP_MEC_JT2:

		if (adev->asic_type == CHIP_TONGA)

		if (adev->asic_type == CHIP_TONGA || adev->asic_type == CHIP_BAFFIN

		  || adev->asic_type == CHIP_ELLESMERE)

			result = AMDGPU_UCODE_ID_CP_MEC2;

		else if (adev->asic_type == CHIP_CARRIZO)

		else

			result = AMDGPU_UCODE_ID_CP_MEC1;

		break;

	case CGS_UCODE_ID_RLC_G:
@@ -741,6 +742,12 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
		case CHIP_FIJI:

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

			break;

		case CHIP_BAFFIN:

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

			break;

		case CHIP_ELLESMERE:

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

			break;

		default:

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

			return -EINVAL;

drivers/gpu/drm/amd/powerplay/smumgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the 'smu manager' sub-component of powerplay.

# It provides the smu management services for the driver.



SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o

SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o ellesmere_smumgr.o



AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))