Commit fa3d49f1 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amd/powerplay: remove the support of vega20 from swsmu 



by default, vega20 will use legacy powerplay driver.
in order to maintain the code conveniently in the future,
remove the support of vega20 from swsmu.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d2d0f8f4

drivers/gpu/drm/amd/powerplay/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/powerplay/,$( 


include $(AMD_POWERPLAY)



POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o smu_v12_0.o vega20_ppt.o arcturus_ppt.o navi10_ppt.o renoir_ppt.o

POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o smu_v12_0.o arcturus_ppt.o navi10_ppt.o renoir_ppt.o



AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR))

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+2 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "smu_v11_0.h"

#include "smu_v12_0.h"

#include "atom.h"

#include "vega20_ppt.h"

#include "arcturus_ppt.h"

#include "navi10_ppt.h"

#include "renoir_ppt.h"
@@ -567,12 +566,11 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, int 


bool is_support_sw_smu(struct amdgpu_device *adev)

{

	if (adev->asic_type == CHIP_VEGA20)

		return (amdgpu_dpm == 2) ? true : false;

	else if (adev->asic_type >= CHIP_ARCTURUS) {

	if (adev->asic_type >= CHIP_ARCTURUS) {

	      if (amdgpu_sriov_is_pp_one_vf(adev) || !amdgpu_sriov_vf(adev))

			return true;

	}



	return false;

}
@@ -760,10 +758,6 @@ static int smu_set_funcs(struct amdgpu_device *adev) 
		smu->od_enabled = true;



	switch (adev->asic_type) {

	case CHIP_VEGA20:

		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;

		vega20_set_ppt_funcs(smu);

		break;

	case CHIP_NAVI10:

	case CHIP_NAVI14:

	case CHIP_NAVI12:

drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "amdgpu_smu.h"



#define SMU11_DRIVER_IF_VERSION_INV 0xFFFFFFFF

#define SMU11_DRIVER_IF_VERSION_VG20 0x13

#define SMU11_DRIVER_IF_VERSION_ARCT 0x14

#define SMU11_DRIVER_IF_VERSION_NV10 0x36

#define SMU11_DRIVER_IF_VERSION_NV12 0x33

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+0 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "asic_reg/smuio/smuio_11_0_0_offset.h"

#include "asic_reg/smuio/smuio_11_0_0_sh_mask.h"



MODULE_FIRMWARE("amdgpu/vega20_smc.bin");

MODULE_FIRMWARE("amdgpu/arcturus_smc.bin");

MODULE_FIRMWARE("amdgpu/navi10_smc.bin");

MODULE_FIRMWARE("amdgpu/navi14_smc.bin");
@@ -148,9 +147,6 @@ int smu_v11_0_init_microcode(struct smu_context *smu) 
	struct amdgpu_firmware_info *ucode = NULL;



	switch (adev->asic_type) {

	case CHIP_VEGA20:

		chip_name = "vega20";

		break;

	case CHIP_ARCTURUS:

		chip_name = "arcturus";

		break;
@@ -270,9 +266,6 @@ int smu_v11_0_check_fw_version(struct smu_context *smu) 
	smu_debug = (smu_version >> 0) & 0xff;



	switch (smu->adev->asic_type) {

	case CHIP_VEGA20:

		smu->smc_driver_if_version = SMU11_DRIVER_IF_VERSION_VG20;

		break;

	case CHIP_ARCTURUS:

		smu->smc_driver_if_version = SMU11_DRIVER_IF_VERSION_ARCT;

		break;
@@ -1385,8 +1378,6 @@ int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable) 
	struct amdgpu_device *adev = smu->adev;



	switch (adev->asic_type) {

	case CHIP_VEGA20:

		break;

	case CHIP_NAVI10:

	case CHIP_NAVI14:

	case CHIP_NAVI12:

drivers/gpu/drm/amd/powerplay/vega20_ppt.c

deleted100644 → 0
+0 −3288

File deleted.

Preview size limit exceeded, changes collapsed.