drm/amd/powerplay: update phm_get_voltage_evv_on_sclk for iceland
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 9 Nov 2016 23:04:54 +0000 (18:04 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 10 Nov 2016 16:11:33 +0000 (11:11 -0500)
Was missing the handling for iceland.

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>
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

index 520665e1ef12e189965d3d5d6bfddc1943b24eea..e03dcb6ea9c17c0a3ea5dbf7dc547bf8b55464af 100644 (file)
@@ -710,7 +710,9 @@ 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) {
+       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;