Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99c5e27d authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Refine the interface exported to display 



use void * as function parameter type in order for extension.

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4d5eace

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+1 −2
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ struct amd_pp_simple_clock_info; 
struct amd_pp_display_configuration;

struct amd_pp_clock_info;

struct pp_display_clock_request;

struct pp_wm_sets_with_clock_ranges_soc15;

struct pp_clock_levels_with_voltage;

struct pp_clock_levels_with_latency;

struct amd_pp_clocks;
@@ -261,7 +260,7 @@ struct amd_pm_funcs { 
		enum amd_pp_clock_type type,

		struct pp_clock_levels_with_voltage *clocks);

	int (*set_watermarks_for_clocks_ranges)(void *handle,

		struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges);

						void *clock_ranges);

	int (*display_clock_voltage_request)(void *handle,

				struct pp_display_clock_request *clock);

	int (*get_display_mode_validation_clocks)(void *handle,

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+3 −3
Original line number Diff line number Diff line
@@ -1096,17 +1096,17 @@ static int pp_get_clock_by_type_with_voltage(void *handle, 
}



static int pp_set_watermarks_for_clocks_ranges(void *handle,

		struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges)

		void *clock_ranges)

{

	struct pp_hwmgr *hwmgr = handle;

	int ret = 0;



	if (!hwmgr || !hwmgr->pm_en ||!wm_with_clock_ranges)

	if (!hwmgr || !hwmgr->pm_en || !clock_ranges)

		return -EINVAL;



	mutex_lock(&hwmgr->smu_lock);

	ret = phm_set_watermarks_for_clocks_ranges(hwmgr,

			wm_with_clock_ranges);

			clock_ranges);

	mutex_unlock(&hwmgr->smu_lock);



	return ret;

drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c

+2 −2
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int phm_get_clock_by_type_with_voltage(struct pp_hwmgr *hwmgr, 
}



int phm_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,

		struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges)

					void *clock_ranges)

{

	PHM_FUNC_CHECK(hwmgr);
@@ -443,7 +443,7 @@ int phm_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr, 
		return -EINVAL;



	return hwmgr->hwmgr_func->set_watermarks_for_clocks_ranges(hwmgr,

			wm_with_clock_ranges);

								clock_ranges);

}



int phm_display_clock_voltage_request(struct pp_hwmgr *hwmgr,

drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -1108,9 +1108,10 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, int idx, 
}



static int smu10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,

		struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges)

		void *clock_ranges)

{

	struct smu10_hwmgr *data = hwmgr->backend;

	struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges;

	Watermarks_t *table = &(data->water_marks_table);

	int result = 0;

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -4194,9 +4194,10 @@ static int vega10_get_clock_by_type_with_voltage(struct pp_hwmgr *hwmgr, 
}



static int vega10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,

		struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges)

							void *clock_range)

{

	struct vega10_hwmgr *data = hwmgr->backend;

	struct pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_range;

	Watermarks_t *table = &(data->smc_state_table.water_marks_table);

	int result = 0;