openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: DMCU and ABM maintenance and refactor 

Remove some globals that should really be per block state.

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Anthony Koo 2017-11-13 10:54:59 -05:00 committed by Alex Deucher
parent 8980aa3c9e
commit 404dfe1c56
4 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
View File

@ -51,16 +51,6 @@
#define MCP_DISABLE_ABM_IMMEDIATELY 255 #define MCP_DISABLE_ABM_IMMEDIATELY 255
struct abm_backlight_registers {
unsigned int BL_PWM_CNTL;
unsigned int BL_PWM_CNTL2;
unsigned int BL_PWM_PERIOD_CNTL;
unsigned int LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV;
};
/* registers setting needs to be save and restored used at InitBacklight */
static struct abm_backlight_registers stored_backlight_registers = {0};
static unsigned int get_current_backlight_16_bit(struct dce_abm *abm_dce) static unsigned int get_current_backlight_16_bit(struct dce_abm *abm_dce)
{ {
@ -347,16 +337,16 @@ static bool dce_abm_init_backlight(struct abm *abm)
*/ */
REG_GET(BL_PWM_CNTL, BL_ACTIVE_INT_FRAC_CNT, &value); REG_GET(BL_PWM_CNTL, BL_ACTIVE_INT_FRAC_CNT, &value);
if (value == 0 || value == 1) { if (value == 0 || value == 1) {
if (stored_backlight_registers.BL_PWM_CNTL != 0) { if (abm->stored_backlight_registers.BL_PWM_CNTL != 0) {
REG_WRITE(BL_PWM_CNTL, REG_WRITE(BL_PWM_CNTL,
stored_backlight_registers.BL_PWM_CNTL); abm->stored_backlight_registers.BL_PWM_CNTL);
REG_WRITE(BL_PWM_CNTL2, REG_WRITE(BL_PWM_CNTL2,
stored_backlight_registers.BL_PWM_CNTL2); abm->stored_backlight_registers.BL_PWM_CNTL2);
REG_WRITE(BL_PWM_PERIOD_CNTL, REG_WRITE(BL_PWM_PERIOD_CNTL,
stored_backlight_registers.BL_PWM_PERIOD_CNTL); abm->stored_backlight_registers.BL_PWM_PERIOD_CNTL);
REG_UPDATE(LVTMA_PWRSEQ_REF_DIV, REG_UPDATE(LVTMA_PWRSEQ_REF_DIV,
BL_PWM_REF_DIV, BL_PWM_REF_DIV,
stored_backlight_registers. abm->stored_backlight_registers.
LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV); LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV);
} else { } else {
/* TODO: Note: This should not really happen since VBIOS /* TODO: Note: This should not really happen since VBIOS
@ -366,15 +356,15 @@ static bool dce_abm_init_backlight(struct abm *abm)
REG_WRITE(BL_PWM_PERIOD_CNTL, 0x000C0FA0); REG_WRITE(BL_PWM_PERIOD_CNTL, 0x000C0FA0);
} }
} else { } else {
stored_backlight_registers.BL_PWM_CNTL = abm->stored_backlight_registers.BL_PWM_CNTL =
REG_READ(BL_PWM_CNTL); REG_READ(BL_PWM_CNTL);
stored_backlight_registers.BL_PWM_CNTL2 = abm->stored_backlight_registers.BL_PWM_CNTL2 =
REG_READ(BL_PWM_CNTL2); REG_READ(BL_PWM_CNTL2);
stored_backlight_registers.BL_PWM_PERIOD_CNTL = abm->stored_backlight_registers.BL_PWM_PERIOD_CNTL =
REG_READ(BL_PWM_PERIOD_CNTL); REG_READ(BL_PWM_PERIOD_CNTL);
REG_GET(LVTMA_PWRSEQ_REF_DIV, BL_PWM_REF_DIV, REG_GET(LVTMA_PWRSEQ_REF_DIV, BL_PWM_REF_DIV,
&stored_backlight_registers. &abm->stored_backlight_registers.
LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV); LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV);
} }
@ -450,6 +440,10 @@ static void dce_abm_construct(
base->ctx = ctx; base->ctx = ctx;
base->funcs = &dce_funcs; base->funcs = &dce_funcs;
base->stored_backlight_registers.BL_PWM_CNTL = 0;
base->stored_backlight_registers.BL_PWM_CNTL2 = 0;
base->stored_backlight_registers.BL_PWM_PERIOD_CNTL = 0;
base->stored_backlight_registers.LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV = 0;
abm_dce->regs = regs; abm_dce->regs = regs;
abm_dce->abm_shift = abm_shift; abm_dce->abm_shift = abm_shift;

18
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
View File

@ -53,7 +53,6 @@
#define MCP_INIT_IRAM 0x89 #define MCP_INIT_IRAM 0x89
#define MCP_DMCU_VERSION 0x90 #define MCP_DMCU_VERSION 0x90
#define MASTER_COMM_CNTL_REG__MASTER_COMM_INTERRUPT_MASK 0x00000001L #define MASTER_COMM_CNTL_REG__MASTER_COMM_INTERRUPT_MASK 0x00000001L
unsigned int cached_wait_loop_number = 0;
static bool dce_dmcu_init(struct dmcu *dmcu) static bool dce_dmcu_init(struct dmcu *dmcu)
{ {
@ -270,7 +269,7 @@ static void dce_psr_wait_loop(
{ {
struct dce_dmcu *dmcu_dce = TO_DCE_DMCU(dmcu); struct dce_dmcu *dmcu_dce = TO_DCE_DMCU(dmcu);
union dce_dmcu_psr_config_data_wait_loop_reg1 masterCmdData1; union dce_dmcu_psr_config_data_wait_loop_reg1 masterCmdData1;
if (cached_wait_loop_number == wait_loop_number) if (dmcu->cached_wait_loop_number == wait_loop_number)
return; return;
/* waitDMCUReadyForCmd */ /* waitDMCUReadyForCmd */
@ -278,7 +277,7 @@ static void dce_psr_wait_loop(
masterCmdData1.u32 = 0; masterCmdData1.u32 = 0;
masterCmdData1.bits.wait_loop = wait_loop_number; masterCmdData1.bits.wait_loop = wait_loop_number;
cached_wait_loop_number = wait_loop_number; dmcu->cached_wait_loop_number = wait_loop_number;
dm_write_reg(dmcu->ctx, REG(MASTER_COMM_DATA_REG1), masterCmdData1.u32); dm_write_reg(dmcu->ctx, REG(MASTER_COMM_DATA_REG1), masterCmdData1.u32);
/* setDMCUParam_Cmd */ /* setDMCUParam_Cmd */
@ -288,9 +287,10 @@ static void dce_psr_wait_loop(
REG_UPDATE(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 1); REG_UPDATE(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 1);
} }
static void dce_get_psr_wait_loop(unsigned int *psr_wait_loop_number) static void dce_get_psr_wait_loop(
struct dmcu *dmcu, unsigned int *psr_wait_loop_number)
{ {
*psr_wait_loop_number = cached_wait_loop_number; *psr_wait_loop_number = dmcu->cached_wait_loop_number;
return; return;
} }
@ -673,7 +673,7 @@ static void dcn10_psr_wait_loop(
masterCmdData1.u32 = 0; masterCmdData1.u32 = 0;
masterCmdData1.bits.wait_loop = wait_loop_number; masterCmdData1.bits.wait_loop = wait_loop_number;
cached_wait_loop_number = wait_loop_number; dmcu->cached_wait_loop_number = wait_loop_number;
dm_write_reg(dmcu->ctx, REG(MASTER_COMM_DATA_REG1), masterCmdData1.u32); dm_write_reg(dmcu->ctx, REG(MASTER_COMM_DATA_REG1), masterCmdData1.u32);
/* setDMCUParam_Cmd */ /* setDMCUParam_Cmd */
@ -684,9 +684,10 @@ static void dcn10_psr_wait_loop(
} }
} }
static void dcn10_get_psr_wait_loop(unsigned int *psr_wait_loop_number) static void dcn10_get_psr_wait_loop(
struct dmcu *dmcu, unsigned int *psr_wait_loop_number)
{ {
*psr_wait_loop_number = cached_wait_loop_number; *psr_wait_loop_number = dmcu->cached_wait_loop_number;
return; return;
} }
@ -725,6 +726,7 @@ static void dce_dmcu_construct(
base->ctx = ctx; base->ctx = ctx;
base->funcs = &dce_funcs; base->funcs = &dce_funcs;
base->cached_wait_loop_number = 0;
dmcu_dce->regs = regs; dmcu_dce->regs = regs;
dmcu_dce->dmcu_shift = dmcu_shift; dmcu_dce->dmcu_shift = dmcu_shift;

10
drivers/gpu/drm/amd/display/dc/inc/hw/abm.h
View File

@ -27,9 +27,19 @@
#include "dm_services_types.h" #include "dm_services_types.h"
struct abm_backlight_registers {
unsigned int BL_PWM_CNTL;
unsigned int BL_PWM_CNTL2;
unsigned int BL_PWM_PERIOD_CNTL;
unsigned int LVTMA_PWRSEQ_REF_DIV_BL_PWM_REF_DIV;
};
struct abm { struct abm {
struct dc_context *ctx; struct dc_context *ctx;
const struct abm_funcs *funcs; const struct abm_funcs *funcs;
/* registers setting needs to be saved and restored at InitBacklight */
struct abm_backlight_registers stored_backlight_registers;
}; };
struct abm_funcs { struct abm_funcs {

4
drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h
View File

@ -45,6 +45,7 @@ struct dmcu {
enum dmcu_state dmcu_state; enum dmcu_state dmcu_state;
struct dmcu_version dmcu_version; struct dmcu_version dmcu_version;
unsigned int cached_wait_loop_number;
}; };
struct dmcu_funcs { struct dmcu_funcs {
@ -60,7 +61,8 @@ struct dmcu_funcs {
void (*get_psr_state)(struct dmcu *dmcu, uint32_t *psr_state); void (*get_psr_state)(struct dmcu *dmcu, uint32_t *psr_state);
void (*set_psr_wait_loop)(struct dmcu *dmcu, void (*set_psr_wait_loop)(struct dmcu *dmcu,
unsigned int wait_loop_number); unsigned int wait_loop_number);
void (*get_psr_wait_loop)(unsigned int *psr_wait_loop_number); void (*get_psr_wait_loop)(struct dmcu *dmcu,
unsigned int *psr_wait_loop_number);
}; };
#endif #endif