summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 1167205057b3..e03dcb6ea9c1 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -710,13 +710,15 @@ int phm_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
uint32_t vol;
int ret = 0;
- if (hwmgr->chip_id < CHIP_POLARIS10) {
- atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage);
+ if (hwmgr->chip_id < CHIP_TONGA) {
+ ret = atomctrl_get_voltage_evv(hwmgr, id, voltage);
+ } else if (hwmgr->chip_id < CHIP_POLARIS10) {
+ ret = atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage);
if (*voltage >= 2000 || *voltage == 0)
*voltage = 1150;
} else {
ret = atomctrl_get_voltage_evv_on_sclk_ai(hwmgr, voltage_type, sclk, id, &vol);
- *voltage = (uint16_t)vol/100;
+ *voltage = (uint16_t)(vol/100);
}
return ret;
}
sun6i: Add default clock name for LOSCChen-Yu Tsai 2018-08-27rtc: sun6i: Use struct_size() in kzalloc()Gustavo A. R. Silva 2018-05-31rtc: sun6i: Fix bit_idx value for clk_register_gateMichael Trimarchi 2018-03-02rtc: stop validating rtc_time in .read_timeAlexandre Belloni 2017-12-18rtc: sun6i: ensure rtc is kfree'd on errorColin Ian King 2017-09-01rtc: sun6i: Add support for the external oscillator gateMaxime Ripard 2017-07-31rtc: sun6i: ensure clk_data is kfree'd on errorColin Ian King 2017-07-31rtc: sun6i: Remove double init of spinlock in sun6i_rtc_clk_init()Alexey Klimov 2017-02-12rtc: sun6i: Fix return value check in sun6i_rtc_clk_init()Wei Yongjun 2017-02-01rtc: sun6i: Fix compatibility with old DT bindingChen-Yu Tsai 2017-02-01rtc: sun6i: Switch to devm_rtc_device_registerMaxime Ripard 2017-02-01rtc: sun6i: Expose the 32kHz oscillatorMaxime Ripard 2017-02-01rtc: sun6i: Switch to the external oscillatorMaxime Ripard 2017-02-01rtc: sun6i: Add some lockingMaxime Ripard 2017-01-24rtc: sun6i: Disable the build as a moduleMaxime Ripard 2014-09-19rtc: sun6i: Add sun6i RTC driverChen-Yu Tsai