aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2018-01-16 03:00:02 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-02-19 14:17:54 -0500
commit59fc8cde739bc81464d214b23fd717f24608eb75 (patch)
treee03f380553ea6cb0b908a08f31b656745eba0718 /drivers/gpu/drm/amd
parentee85c07abe0f9899c4d18796bc2d6b90aa7ad4af (diff)
drm/amd/pp: Move DPMTABLE_* definitions to common header file
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h5
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h6
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h11
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h
index beba25cb2b07..8d4e9c193b8b 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h
@@ -34,11 +34,6 @@
34#define SMU7_VOLTAGE_CONTROL_BY_SVID2 0x2 34#define SMU7_VOLTAGE_CONTROL_BY_SVID2 0x2
35#define SMU7_VOLTAGE_CONTROL_MERGED 0x3 35#define SMU7_VOLTAGE_CONTROL_MERGED 0x3
36 36
37#define DPMTABLE_OD_UPDATE_SCLK 0x00000001
38#define DPMTABLE_OD_UPDATE_MCLK 0x00000002
39#define DPMTABLE_UPDATE_SCLK 0x00000004
40#define DPMTABLE_UPDATE_MCLK 0x00000008
41
42enum gpu_pt_config_reg_type { 37enum gpu_pt_config_reg_type {
43 GPU_CONFIGREG_MMR = 0, 38 GPU_CONFIGREG_MMR = 0,
44 GPU_CONFIGREG_SMC_IND, 39 GPU_CONFIGREG_SMC_IND,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
index 689fe9f5e0b8..ab3e8798bee8 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h
@@ -189,12 +189,6 @@ struct vega10_vbios_boot_state {
189 uint32_t dcef_clock; 189 uint32_t dcef_clock;
190}; 190};
191 191
192#define DPMTABLE_OD_UPDATE_SCLK 0x00000001
193#define DPMTABLE_OD_UPDATE_MCLK 0x00000002
194#define DPMTABLE_UPDATE_SCLK 0x00000004
195#define DPMTABLE_UPDATE_MCLK 0x00000008
196#define DPMTABLE_OD_UPDATE_VDDC 0x00000010
197
198struct vega10_smc_state_table { 192struct vega10_smc_state_table {
199 uint32_t soc_boot_level; 193 uint32_t soc_boot_level;
200 uint32_t gfx_boot_level; 194 uint32_t gfx_boot_level;
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
index d6772a8f242d..6f528e662a6f 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
@@ -358,6 +358,17 @@ struct phm_clocks {
358 uint32_t clock[MAX_NUM_CLOCKS]; 358 uint32_t clock[MAX_NUM_CLOCKS];
359}; 359};
360 360
361#define DPMTABLE_OD_UPDATE_SCLK 0x00000001
362#define DPMTABLE_OD_UPDATE_MCLK 0x00000002
363#define DPMTABLE_UPDATE_SCLK 0x00000004
364#define DPMTABLE_UPDATE_MCLK 0x00000008
365#define DPMTABLE_OD_UPDATE_VDDC 0x00000010
366
367/* To determine if sclk and mclk are in overdrive state */
368#define SCLK_OVERDRIVE_ENABLED 0x00000001
369#define MCLK_OVERDRIVE_ENABLED 0x00000002
370#define VDDC_OVERDRIVE_ENABLED 0x00000010
371
361struct phm_odn_performance_level { 372struct phm_odn_performance_level {
362 uint32_t clock; 373 uint32_t clock;
363 uint32_t vddc; 374 uint32_t vddc;