Commit 28a31774 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

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



Move it to kv_dpm.c instead.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a79110f2

drivers/gpu/drm/amd/pm/amdgpu_dpm.c

+0 −23
Original line number Diff line number Diff line
@@ -209,29 +209,6 @@ static 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;

drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h

+0 −2
Original line number Diff line number Diff line
@@ -382,8 +382,6 @@ u32 amdgpu_dpm_get_vblank_time(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);

drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c

+24 −1
Original line number Diff line number Diff line
@@ -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");