drm/amd/pm: do not expose the API used internally only in kv_dpm.c

[ Upstream commit 28a31774b050261371953401e8072ae15200c91e ]

Move it to kv_dpm.c instead.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Stable-dep-of: 733025626866 ("drm/amdgpu: Reset IH OVERFLOW_CLEAR bit")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
index a68496b3f929620a1f5deb29ba34c96d487fa345..197ea6e263878b9b7a4c423fad048459bf62fd63 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
@@ -188,29 +188,6 @@ u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev)
        return vrefresh;
 }
 
-bool amdgpu_is_internal_thermal_sensor(enum amdgpu_int_thermal_type sensor)
-{
-       switch (sensor) {
-       case THERMAL_TYPE_RV6XX:
-       case THERMAL_TYPE_RV770:
-       case THERMAL_TYPE_EVERGREEN:
-       case THERMAL_TYPE_SUMO:
-       case THERMAL_TYPE_NI:
-       case THERMAL_TYPE_SI:
-       case THERMAL_TYPE_CI:
-       case THERMAL_TYPE_KV:
-               return true;
-       case THERMAL_TYPE_ADT7473_WITH_INTERNAL:
-       case THERMAL_TYPE_EMC2103_WITH_INTERNAL:
-               return false; /* need special handling */
-       case THERMAL_TYPE_NONE:
-       case THERMAL_TYPE_EXTERNAL:
-       case THERMAL_TYPE_EXTERNAL_GPIO:
-       default:
-               return false;
-       }
-}
-
 union power_info {
        struct _ATOM_POWERPLAY_INFO info;
        struct _ATOM_POWERPLAY_INFO_V2 info_2;

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
index 16e3f72d31b9ff59fd2384e03b10031a22ad6193..a3f6caaec88c7b3965db35f55658f4f085b7bec8 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
@@ -501,8 +501,6 @@ void amdgpu_dpm_get_active_displays(struct amdgpu_device *adev);
 int amdgpu_dpm_read_sensor(struct amdgpu_device *adev, enum amd_pp_sensors sensor,
                           void *data, uint32_t *size);
 
-bool amdgpu_is_internal_thermal_sensor(enum amdgpu_int_thermal_type sensor);
-
 int amdgpu_get_platform_caps(struct amdgpu_device *adev);
 
 int amdgpu_parse_extended_power_table(struct amdgpu_device *adev);

diff --git a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c b/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c
index 309c9f0b8f83a7dcd3ed7a9187bdcc6cc3f4c8bc..b56854c03ead6336c3e4fd5fac432bb0cb729141 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c
@@ -1256,6 +1256,29 @@ static void kv_dpm_enable_bapm(void *handle, bool enable)
        }
 }
 
+static bool kv_is_internal_thermal_sensor(enum amdgpu_int_thermal_type sensor)
+{
+       switch (sensor) {
+       case THERMAL_TYPE_RV6XX:
+       case THERMAL_TYPE_RV770:
+       case THERMAL_TYPE_EVERGREEN:
+       case THERMAL_TYPE_SUMO:
+       case THERMAL_TYPE_NI:
+       case THERMAL_TYPE_SI:
+       case THERMAL_TYPE_CI:
+       case THERMAL_TYPE_KV:
+               return true;
+       case THERMAL_TYPE_ADT7473_WITH_INTERNAL:
+       case THERMAL_TYPE_EMC2103_WITH_INTERNAL:
+               return false; /* need special handling */
+       case THERMAL_TYPE_NONE:
+       case THERMAL_TYPE_EXTERNAL:
+       case THERMAL_TYPE_EXTERNAL_GPIO:
+       default:
+               return false;
+       }
+}
+
 static int kv_dpm_enable(struct amdgpu_device *adev)
 {
        struct kv_power_info *pi = kv_get_pi(adev);
@@ -1352,7 +1375,7 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
        }
 
        if (adev->irq.installed &&
-           amdgpu_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
+           kv_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
                ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX);
                if (ret) {
                        DRM_ERROR("kv_set_thermal_temperature_range failed\n");