Commit 45313e5f authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Move same macro definitions to hwmgr.h 



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

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+0 −4
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ 
#define SMC_CG_IND_START            0xc0030000

#define SMC_CG_IND_END              0xc0040000



#define VOLTAGE_SCALE               4

#define VOLTAGE_VID_OFFSET_SCALE1   625

#define VOLTAGE_VID_OFFSET_SCALE2   100



#define MEM_FREQ_LOW_LATENCY        25000

#define MEM_FREQ_HIGH_LATENCY       80000

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+0 −4
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ 
#include "smuio/smuio_9_0_offset.h"

#include "smuio/smuio_9_0_sh_mask.h"



#define VOLTAGE_SCALE  4

#define VOLTAGE_VID_OFFSET_SCALE1   625

#define VOLTAGE_VID_OFFSET_SCALE2   100



#define HBM_MEMORY_CHANNEL_WIDTH    128



static const uint32_t channel_number[] = {1, 2, 0, 4, 0, 8, 0, 16, 2};

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ struct phm_fan_speed_info; 
struct pp_atomctrl_voltage_table;



#define VOLTAGE_SCALE 4

#define VOLTAGE_VID_OFFSET_SCALE1   625

#define VOLTAGE_VID_OFFSET_SCALE2   100



enum DISPLAY_GAP {

	DISPLAY_GAP_VBLANK_OR_WM = 0,   /* Wait for vblank or MCHG watermark. */

drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 


#define SMC_RAM_END 0x40000



#define VOLTAGE_SCALE               4

#define VOLTAGE_VID_OFFSET_SCALE1    625

#define VOLTAGE_VID_OFFSET_SCALE2    100

#define CISLAND_MINIMUM_ENGINE_CLOCK 800

#define CISLAND_MAX_DEEPSLEEP_DIVIDER_ID 5

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

+0 −3
Original line number Diff line number Diff line
@@ -53,10 +53,7 @@ 


#define FIJI_SMC_SIZE 0x20000



#define VOLTAGE_SCALE 4

#define POWERTUNE_DEFAULT_SET_MAX    1

#define VOLTAGE_VID_OFFSET_SCALE1   625

#define VOLTAGE_VID_OFFSET_SCALE2   100

#define VDDC_VDDCI_DELTA            300

#define MC_CG_ARB_FREQ_F1           0x0b