Commit b455159c authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu/powerplay: add initial swSMU support for sienna_cichlid (v2) 



SMU11 based similar to navi1x.

v2: squash in SMU IF updates

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a986760

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 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 sienna_cichlid_ppt.o



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

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

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

#include "arcturus_ppt.h"

#include "navi10_ppt.h"

#include "sienna_cichlid_ppt.h"

#include "renoir_ppt.h"



#undef __SMU_DUMMY_MAP
@@ -762,6 +763,9 @@ static int smu_set_funcs(struct amdgpu_device *adev) 
		/* OD is not supported on Arcturus */

		smu->od_enabled =false;

		break;

	case CHIP_SIENNA_CICHLID:

		sienna_cichlid_set_ppt_funcs(smu);

		break;

	case CHIP_RENOIR:

		renoir_set_ppt_funcs(smu);

		break;
@@ -1051,7 +1055,8 @@ static int smu_smc_table_hw_init(struct smu_context *smu, 
		return 0;

	}



	if (adev->asic_type != CHIP_ARCTURUS) {

	if (adev->asic_type != CHIP_ARCTURUS &&

	    adev->asic_type != CHIP_SIENNA_CICHLID) {

		ret = smu_init_display_count(smu, 0);

		if (ret)

			return ret;
@@ -1157,7 +1162,8 @@ static int smu_smc_table_hw_init(struct smu_context *smu, 
		}

	}



	if (adev->asic_type != CHIP_ARCTURUS) {

	if (adev->asic_type != CHIP_ARCTURUS &&

	    adev->asic_type != CHIP_SIENNA_CICHLID) {

		ret = smu_notify_display_change(smu);

		if (ret)

			return ret;

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

0 → 100644
+1209 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ enum smu_clk_type { 
	SMU_GFXCLK,

	SMU_VCLK,

	SMU_DCLK,

	SMU_VCLK1,

	SMU_DCLK1,

	SMU_ECLK,

	SMU_SOCCLK,

	SMU_UCLK,

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define SMU11_DRIVER_IF_VERSION_NV10 0x36

#define SMU11_DRIVER_IF_VERSION_NV12 0x33

#define SMU11_DRIVER_IF_VERSION_NV14 0x36

#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x30



/* MP Apertures */

#define MP0_Public			0x03800000