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

Commit fa7bd27d authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: move PP_FEATURE_MASK to amd_shared header 



It will be used not only for powerplay but also on amdgpu part in future
patches. So move it into amd_shared header file.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af15890d

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ enum amdgpu_dpm_event_src { 
	AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL = 4

};



#define SCLK_DEEP_SLEEP_MASK 0x8



struct amdgpu_ps {

	u32 caps; /* vbios flags */

	u32 class; /* vbios flags */

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

+1 −1
Original line number Diff line number Diff line
@@ -5903,7 +5903,7 @@ static int ci_dpm_init(struct amdgpu_device *adev) 
	pi->pcie_dpm_key_disabled = 0;

	pi->thermal_sclk_dpm_enabled = 0;



	if (amdgpu_pp_feature_mask & SCLK_DEEP_SLEEP_MASK)

	if (amdgpu_pp_feature_mask & PP_SCLK_DEEP_SLEEP_MASK)

		pi->caps_sclk_ds = true;

	else

		pi->caps_sclk_ds = false;

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

+1 −1
Original line number Diff line number Diff line
@@ -2817,7 +2817,7 @@ static int kv_dpm_init(struct amdgpu_device *adev) 
		pi->caps_tcp_ramping = true;

	}



	if (amdgpu_pp_feature_mask & SCLK_DEEP_SLEEP_MASK)

	if (amdgpu_pp_feature_mask & PP_SCLK_DEEP_SLEEP_MASK)

		pi->caps_sclk_ds = true;

	else

		pi->caps_sclk_ds = false;

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

+19 −0
Original line number Diff line number Diff line
@@ -109,6 +109,25 @@ enum amd_powergating_state { 
#define AMD_PG_SUPPORT_GFX_PIPELINE		(1 << 12)

#define AMD_PG_SUPPORT_MMHUB			(1 << 13)



enum PP_FEATURE_MASK {

	PP_SCLK_DPM_MASK = 0x1,

	PP_MCLK_DPM_MASK = 0x2,

	PP_PCIE_DPM_MASK = 0x4,

	PP_SCLK_DEEP_SLEEP_MASK = 0x8,

	PP_POWER_CONTAINMENT_MASK = 0x10,

	PP_UVD_HANDSHAKE_MASK = 0x20,

	PP_SMC_VOLTAGE_CONTROL_MASK = 0x40,

	PP_VBI_TIME_SUPPORT_MASK = 0x80,

	PP_ULV_MASK = 0x100,

	PP_ENABLE_GFX_CG_THRU_SMU = 0x200,

	PP_CLOCK_STRETCH_MASK = 0x400,

	PP_OD_FUZZY_FAN_CONTROL_MASK = 0x800,

	PP_SOCCLK_DPM_MASK = 0x1000,

	PP_DCEFCLK_DPM_MASK = 0x2000,

	PP_OVERDRIVE_MASK = 0x4000,

	PP_ACG_MASK = 0x10000,

};



struct amd_ip_funcs {

	/* Name of IP block */

	char *name;

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

+0 −19
Original line number Diff line number Diff line
@@ -66,25 +66,6 @@ struct vi_dpm_table { 
#define PCIE_PERF_REQ_GEN2         3

#define PCIE_PERF_REQ_GEN3         4



enum PP_FEATURE_MASK {

	PP_SCLK_DPM_MASK = 0x1,

	PP_MCLK_DPM_MASK = 0x2,

	PP_PCIE_DPM_MASK = 0x4,

	PP_SCLK_DEEP_SLEEP_MASK = 0x8,

	PP_POWER_CONTAINMENT_MASK = 0x10,

	PP_UVD_HANDSHAKE_MASK = 0x20,

	PP_SMC_VOLTAGE_CONTROL_MASK = 0x40,

	PP_VBI_TIME_SUPPORT_MASK = 0x80,

	PP_ULV_MASK = 0x100,

	PP_ENABLE_GFX_CG_THRU_SMU = 0x200,

	PP_CLOCK_STRETCH_MASK = 0x400,

	PP_OD_FUZZY_FAN_CONTROL_MASK = 0x800,

	PP_SOCCLK_DPM_MASK = 0x1000,

	PP_DCEFCLK_DPM_MASK = 0x2000,

	PP_OVERDRIVE_MASK = 0x4000,

	PP_ACG_MASK = 0x10000,

};



enum PHM_BackEnd_Magic {

	PHM_Dummy_Magic       = 0xAA5555AA,

	PHM_RV770_Magic       = 0xDCBAABCD,