projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sunxi-drm-fixes-for-4.7-2' of https://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
amd
/
powerplay
/
hwmgr
/
ppatomctrl.c
diff --git
a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
index
bf4e18f
..
90b35c5
100644
(file)
--- a/
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
+++ b/
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
@@
-1256,7
+1256,7
@@
int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock,
}
int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
}
int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
- uint32_t sclk, uint16_t virtual_voltage_Id, uint
16
_t *voltage)
+ uint32_t sclk, uint16_t virtual_voltage_Id, uint
32
_t *voltage)
{
int result;
{
int result;
@@
-1274,7
+1274,7
@@
int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_
if (0 != result)
return result;
if (0 != result)
return result;
- *voltage =
get_voltage_info_param_space.us
VoltageLevel;
+ *voltage =
((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *)(&get_voltage_info_param_space))->ul
VoltageLevel;
return result;
}
return result;
}