drm/radeon: make get_temperature functions a callback

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 22 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 788c64cb4b47..e8c1bea9b57b 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -434,27 +434,10 @@ static ssize_t radeon_hwmon_show_temp(struct device *dev,
         struct radeon_device *rdev = ddev->dev_private;
         int temp;
 
-        switch (rdev->pm.int_thermal_type) {
-        case THERMAL_TYPE_RV6XX:
-                temp = rv6xx_get_temp(rdev);
-                break;
-        case THERMAL_TYPE_RV770:
-                temp = rv770_get_temp(rdev);
-                break;
-        case THERMAL_TYPE_EVERGREEN:
-        case THERMAL_TYPE_NI:
-                temp = evergreen_get_temp(rdev);
-                break;
-        case THERMAL_TYPE_SUMO:
-                temp = sumo_get_temp(rdev);
-                break;
-        case THERMAL_TYPE_SI:
-                temp = si_get_temp(rdev);
-                break;
-        default:
+        if (rdev->asic->pm.get_temperature)
+                temp = radeon_get_temperature(rdev);
+        else
                 temp = 0;
-                break;
-        }
 
         return snprintf(buf, PAGE_SIZE, "%d\n", temp);
 }
@@ -492,8 +475,7 @@ static int radeon_hwmon_init(struct radeon_device *rdev)
         case THERMAL_TYPE_NI:
         case THERMAL_TYPE_SUMO:
         case THERMAL_TYPE_SI:
-                /* No support for TN yet */
-                if (rdev->family == CHIP_ARUBA)
+                if (rdev->asic->pm.get_temperature == NULL)
                         return err;
                 rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev);
                 if (IS_ERR(rdev->pm.int_hwmon_dev)) {