Commit e8e91f93 authored by Rizvi's avatar Rizvi Committed by Alex Deucher

drm/amd/display: gradually ramp ABM intensity

[Why]
Need driver to pass values of backlight ramp start and ramp reduction so
that intensity can be ramped down appropriately.

[How]
Using abm_parameters structure to get these values from driver.
Signed-off-by: default avatarRizvi <syerizvi@amd.com>
Acked-by: default avatarBindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9413b23f
...@@ -82,22 +82,24 @@ struct abm_parameters { ...@@ -82,22 +82,24 @@ struct abm_parameters {
unsigned char deviation_gain; unsigned char deviation_gain;
unsigned char min_knee; unsigned char min_knee;
unsigned char max_knee; unsigned char max_knee;
unsigned short blRampReduction;
unsigned short blRampStart;
}; };
static const struct abm_parameters abm_settings_config0[abm_defines_max_level] = { static const struct abm_parameters abm_settings_config0[abm_defines_max_level] = {
// min_red max_red bright_pos dark_pos brightness_gain contrast deviation min_knee max_knee // min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed
{0xff, 0xbf, 0x20, 0x00, 0xff, 0x99, 0xb3, 0x40, 0xe0}, {0xff, 0xbf, 0x20, 0x00, 0xff, 0x99, 0xb3, 0x40, 0xe0, 0xCCCC, 0xCCCC},
{0xde, 0x85, 0x20, 0x00, 0xff, 0x90, 0xa8, 0x40, 0xdf}, {0xde, 0x85, 0x20, 0x00, 0xff, 0x90, 0xa8, 0x40, 0xdf, 0xCCCC, 0xCCCC},
{0xb0, 0x50, 0x20, 0x00, 0xc0, 0x88, 0x78, 0x70, 0xa0}, {0xb0, 0x50, 0x20, 0x00, 0xc0, 0x88, 0x78, 0x70, 0xa0, 0xCCCC, 0xCCCC},
{0x82, 0x40, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70}, {0x82, 0x40, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70, 0xCCCC, 0xCCCC},
}; };
static const struct abm_parameters abm_settings_config1[abm_defines_max_level] = { static const struct abm_parameters abm_settings_config1[abm_defines_max_level] = {
// min_red max_red bright_pos dark_pos brightness_gain contrast deviation min_knee max_knee // min_red max_red bright_pos dark_pos bright_gain contrast dev min_knee max_knee blStart blRed
{0xf0, 0xd9, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70}, {0xf0, 0xd9, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70, 0xCCCC, 0xCCCC},
{0xcd, 0xa5, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70}, {0xcd, 0xa5, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70, 0xCCCC, 0xCCCC},
{0x99, 0x65, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70}, {0x99, 0x65, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70, 0xCCCC, 0xCCCC},
{0x82, 0x4d, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70}, {0x82, 0x4d, 0x20, 0x00, 0x00, 0xff, 0xb3, 0x70, 0x70, 0xCCCC, 0xCCCC},
}; };
static const struct abm_parameters * const abm_settings[] = { static const struct abm_parameters * const abm_settings[] = {
...@@ -662,6 +664,7 @@ bool dmub_init_abm_config(struct resource_pool *res_pool, ...@@ -662,6 +664,7 @@ bool dmub_init_abm_config(struct resource_pool *res_pool,
{ {
struct iram_table_v_2_2 ram_table; struct iram_table_v_2_2 ram_table;
struct abm_config_table config; struct abm_config_table config;
unsigned int set = params.set;
bool result = false; bool result = false;
uint32_t i, j = 0; uint32_t i, j = 0;
...@@ -710,6 +713,18 @@ bool dmub_init_abm_config(struct resource_pool *res_pool, ...@@ -710,6 +713,18 @@ bool dmub_init_abm_config(struct resource_pool *res_pool,
config.max_knee[i] = ram_table.max_knee[i]; config.max_knee[i] = ram_table.max_knee[i];
} }
if (params.backlight_ramping_override) {
for (i = 0; i < NUM_AGGR_LEVEL; i++) {
config.blRampReduction[i] = params.backlight_ramping_reduction;
config.blRampStart[i] = params.backlight_ramping_start;
}
} else {
for (i = 0; i < NUM_AGGR_LEVEL; i++) {
config.blRampReduction[i] = abm_settings[set][i].blRampReduction;
config.blRampStart[i] = abm_settings[set][i].blRampStart;
}
}
config.min_abm_backlight = ram_table.min_abm_backlight; config.min_abm_backlight = ram_table.min_abm_backlight;
#if defined(CONFIG_DRM_AMD_DC_DCN) #if defined(CONFIG_DRM_AMD_DC_DCN)
......
...@@ -39,6 +39,7 @@ enum abm_defines { ...@@ -39,6 +39,7 @@ enum abm_defines {
struct dmcu_iram_parameters { struct dmcu_iram_parameters {
unsigned int *backlight_lut_array; unsigned int *backlight_lut_array;
unsigned int backlight_lut_array_size; unsigned int backlight_lut_array_size;
bool backlight_ramping_override;
unsigned int backlight_ramping_reduction; unsigned int backlight_ramping_reduction;
unsigned int backlight_ramping_start; unsigned int backlight_ramping_start;
unsigned int min_abm_backlight; unsigned int min_abm_backlight;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment