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

drm/amd/pm: do not expose those APIs used internally only in amdgpu_dpm.c 



Move them to amdgpu_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 13f5dbd6

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

+23 −2
Original line number Diff line number Diff line
@@ -34,6 +34,27 @@ 


#define WIDTH_4K 3840



#define amdgpu_dpm_pre_set_power_state(adev) \

		((adev)->powerplay.pp_funcs->pre_set_power_state((adev)->powerplay.pp_handle))



#define amdgpu_dpm_post_set_power_state(adev) \

		((adev)->powerplay.pp_funcs->post_set_power_state((adev)->powerplay.pp_handle))



#define amdgpu_dpm_display_configuration_changed(adev) \

		((adev)->powerplay.pp_funcs->display_configuration_changed((adev)->powerplay.pp_handle))



#define amdgpu_dpm_print_power_state(adev, ps) \

		((adev)->powerplay.pp_funcs->print_power_state((adev)->powerplay.pp_handle, (ps)))



#define amdgpu_dpm_vblank_too_short(adev) \

		((adev)->powerplay.pp_funcs->vblank_too_short((adev)->powerplay.pp_handle))



#define amdgpu_dpm_enable_bapm(adev, e) \

		((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e)))



#define amdgpu_dpm_check_state_equal(adev, cps, rps, equal) \

		((adev)->powerplay.pp_funcs->check_state_equal((adev)->powerplay.pp_handle, (cps), (rps), (equal)))



void amdgpu_dpm_print_class_info(u32 class, u32 class2)

{

	const char *s;
@@ -120,7 +141,7 @@ void amdgpu_dpm_print_ps_status(struct amdgpu_device *adev, 
	pr_cont("\n");

}



void amdgpu_dpm_get_active_displays(struct amdgpu_device *adev)

static void amdgpu_dpm_get_active_displays(struct amdgpu_device *adev)

{

	struct drm_device *ddev = adev_to_drm(adev);

	struct drm_crtc *crtc;
@@ -168,7 +189,7 @@ u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev) 
	return vblank_time_us;

}



u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev)

static u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev)

{

	struct drm_device *dev = adev_to_drm(adev);

	struct drm_crtc *crtc;

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

+0 −23
Original line number Diff line number Diff line
@@ -259,27 +259,6 @@ enum amdgpu_pcie_gen { 
	AMDGPU_PCIE_GEN_INVALID = 0xffff

};



#define amdgpu_dpm_pre_set_power_state(adev) \

		((adev)->powerplay.pp_funcs->pre_set_power_state((adev)->powerplay.pp_handle))



#define amdgpu_dpm_post_set_power_state(adev) \

		((adev)->powerplay.pp_funcs->post_set_power_state((adev)->powerplay.pp_handle))



#define amdgpu_dpm_display_configuration_changed(adev) \

		((adev)->powerplay.pp_funcs->display_configuration_changed((adev)->powerplay.pp_handle))



#define amdgpu_dpm_print_power_state(adev, ps) \

		((adev)->powerplay.pp_funcs->print_power_state((adev)->powerplay.pp_handle, (ps)))



#define amdgpu_dpm_vblank_too_short(adev) \

		((adev)->powerplay.pp_funcs->vblank_too_short((adev)->powerplay.pp_handle))



#define amdgpu_dpm_enable_bapm(adev, e) \

		((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e)))



#define amdgpu_dpm_check_state_equal(adev, cps, rps, equal) \

		((adev)->powerplay.pp_funcs->check_state_equal((adev)->powerplay.pp_handle, (cps), (rps), (equal)))



#define amdgpu_dpm_reset_power_profile_state(adev, request) \

		((adev)->powerplay.pp_funcs->reset_power_profile_state(\

			(adev)->powerplay.pp_handle, request))
@@ -420,8 +399,6 @@ void amdgpu_dpm_print_cap_info(u32 caps); 
void amdgpu_dpm_print_ps_status(struct amdgpu_device *adev,

				struct amdgpu_ps *rps);

u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev);

u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev);

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);