redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

drm/amd/powerplay: delete duplicated function and definition.

Browse source 
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu 2016-08-11 17:56:56 +08:00 committed by Alex Deucher
parent 00d57e6d6c
commit 41698abb4d
7 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
View file

@ -35,8 +35,6 @@
#include "pp_acpi.h" #include "pp_acpi.h"
#include "amd_acpi.h" #include "amd_acpi.h"
#define VOLTAGE_SCALE 4
extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr); extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr);
extern int tonga_hwmgr_init(struct pp_hwmgr *hwmgr); extern int tonga_hwmgr_init(struct pp_hwmgr *hwmgr);
extern int fiji_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 void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr);
static int hwmgr_set_user_specify_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) int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
{ {
struct pp_hwmgr *hwmgr; struct pp_hwmgr *hwmgr;

8
drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c
View file

@ -1355,14 +1355,6 @@ static int iceland_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
return 0; 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 iceland_populate_bapm_vddc_vid_sidd(struct pp_hwmgr *hwmgr)
{ {
int i; int i;

5
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
View file

@ -736,11 +736,6 @@ int polaris10_setup_default_dpm_tables(struct pp_hwmgr *hwmgr)
return 0; return 0;
} }
uint8_t convert_to_vid(uint16_t vddc)
{
return (uint8_t) ((6200 - (vddc * VOLTAGE_SCALE)) / 25);
}
/** /**
* Mvdd table preparation for SMC. * Mvdd table preparation for SMC.
* *

9
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
View file

@ -1316,15 +1316,6 @@ static int tonga_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
return 0; 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. * Preparation of vddc and vddgfx CAC tables for SMC.
* *

4
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
View file

@ -42,6 +42,10 @@ extern int amdgpu_powercontainment;
extern int amdgpu_sclk_deep_sleep_en; extern int amdgpu_sclk_deep_sleep_en;
extern unsigned amdgpu_pp_feature_mask; extern unsigned amdgpu_pp_feature_mask;
#define VOLTAGE_SCALE 4
uint8_t convert_to_vid(uint16_t vddc);
enum DISPLAY_GAP { enum DISPLAY_GAP {
DISPLAY_GAP_VBLANK_OR_WM = 0, /* Wait for vblank or MCHG watermark. */ DISPLAY_GAP_VBLANK_OR_WM = 0, /* Wait for vblank or MCHG watermark. */
DISPLAY_GAP_VBLANK = 1, /* Wait for vblank. */ DISPLAY_GAP_VBLANK = 1, /* Wait for vblank. */

1
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
View file

@ -40,7 +40,6 @@
#include "cgs_common.h" #include "cgs_common.h"
#define POLARIS10_SMC_SIZE 0x20000 #define POLARIS10_SMC_SIZE 0x20000
#define VOLTAGE_SCALE 4
/* Microcode file is stored in this buffer */ /* Microcode file is stored in this buffer */
#define BUFFER_SIZE 80000 #define BUFFER_SIZE 80000

1
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
View file

@ -29,6 +29,7 @@
#include "cgs_common.h" #include "cgs_common.h"
#include "linux/delay.h" #include "linux/delay.h"
int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
{ {
struct pp_smumgr *smumgr; struct pp_smumgr *smumgr;