drm/amd/powerplay: delete duplicated function and definition. (41698abb) · Commits · 戴 / test

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@
		#include "pp_acpi.h"
		#include "amd_acpi.h"

		#define VOLTAGE_SCALE 4

		extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr);
		extern int tonga_hwmgr_init(struct pp_hwmgr *hwmgr);
		extern int fiji_hwmgr_init(struct pp_hwmgr *hwmgr);
		@@ -46,6 +44,11 @@ extern int iceland_hwmgr_init(struct pp_hwmgr *hwmgr);
		static void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr);
		static int hwmgr_set_user_specify_caps(struct pp_hwmgr *hwmgr);

		uint8_t convert_to_vid(uint16_t vddc)
		{
		return (uint8_t) ((6200 - (vddc * VOLTAGE_SCALE)) / 25);
		}

		int hwmgr_init(struct amd_pp_init pp_init, struct pp_instance handle)
		{
		struct pp_hwmgr *hwmgr;

+0 −8

Original line number	Diff line number	Diff line
		@@ -1355,14 +1355,6 @@ static int iceland_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
		return 0;
		}

		/**
		* Convert a voltage value in mv unit to VID number required by SMU firmware
		*/
		static uint8_t convert_to_vid(uint16_t vddc)
		{
		return (uint8_t) ((6200 - (vddc * VOLTAGE_SCALE)) / 25);
		}

		int iceland_populate_bapm_vddc_vid_sidd(struct pp_hwmgr *hwmgr)
		{
		int i;

+0 −5

Original line number	Diff line number	Diff line
		@@ -736,11 +736,6 @@ int polaris10_setup_default_dpm_tables(struct pp_hwmgr *hwmgr)
		return 0;
		}

		uint8_t convert_to_vid(uint16_t vddc)
		{
		return (uint8_t) ((6200 - (vddc * VOLTAGE_SCALE)) / 25);
		}

		/**
		* Mvdd table preparation for SMC.
		*

+0 −9

Original line number	Diff line number	Diff line
		@@ -1316,15 +1316,6 @@ static int tonga_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
		return 0;
		}

		/**
		* Convert a voltage value in mv unit to VID number required by SMU firmware
		*/
		static uint8_t convert_to_vid(uint16_t vddc)
		{
		return (uint8_t) ((6200 - (vddc * VOLTAGE_SCALE)) / 25);
		}


		/**
		* Preparation of vddc and vddgfx CAC tables for SMC.
		*

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,10 @@ extern int amdgpu_powercontainment;
		extern int amdgpu_sclk_deep_sleep_en;
		extern unsigned amdgpu_pp_feature_mask;

		#define VOLTAGE_SCALE 4

		uint8_t convert_to_vid(uint16_t vddc);

		enum DISPLAY_GAP {
		DISPLAY_GAP_VBLANK_OR_WM = 0, /* Wait for vblank or MCHG watermark. */
		DISPLAY_GAP_VBLANK = 1, /* Wait for vblank. */