diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-11-09 18:01:01 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-11-10 11:10:27 -0500 |
commit | 0a866d38ef3c13cf5834b78df21ee4c39bb5a689 (patch) | |
tree | ba47508ab851b423200a626b776fb258d49761b1 | |
parent | f20024d8ba6bc8abf8d0ec12eabfdedd9935fff2 (diff) |
drm/amd/powerplay: propagate errors in phm_get_voltage_evv_on_sclk
Missing for one case.
bugs:
https://bugzilla.kernel.org/show_bug.cgi?id=185681
https://bugs.freedesktop.org/show_bug.cgi?id=98357
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 2ba7937d2545..520665e1ef12 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | |||
@@ -711,7 +711,7 @@ int phm_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type, | |||
711 | int ret = 0; | 711 | int ret = 0; |
712 | 712 | ||
713 | if (hwmgr->chip_id < CHIP_POLARIS10) { | 713 | if (hwmgr->chip_id < CHIP_POLARIS10) { |
714 | atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage); | 714 | ret = atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage); |
715 | if (*voltage >= 2000 || *voltage == 0) | 715 | if (*voltage >= 2000 || *voltage == 0) |
716 | *voltage = 1150; | 716 | *voltage = 1150; |
717 | } else { | 717 | } else { |