diff options
| author | Wyatt Wood <wyatt.wood@amd.com> | 2020-03-30 09:08:04 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-04-22 18:11:47 -0400 |
| commit | dd5a94ce6c022bf60b821c29728258430912eb0b (patch) | |
| tree | 4b8927f5243286f70c0db719d8f6214fc7bec7cc /drivers/gpu/drm/amd/display/dc/dce | |
| parent | 4c0de7de4cd568d16032d67a768271fb4977f94f (diff) | |
| download | linux-dd5a94ce6c022bf60b821c29728258430912eb0b.tar.bz2 | |
drm/amd/display: Move enable fractional pwm call
[Why]
Dmcu init fw call has some logic to initialize abm values. Since this
doesn't exist on dmcub, must find a proper place for it in the abm
sequence.
[How]
Move enable fractional pwm call.
Signed-off-by: Wyatt Wood <wyatt.wood@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c index 59b2f0b621bd..8baebb594de5 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c @@ -161,6 +161,21 @@ static void dmcub_set_backlight_level( REG_WRITE(BIOS_SCRATCH_2, s2); } +static void dmub_abm_enable_fractional_pwm(struct dc_context *dc) +{ + union dmub_rb_cmd cmd; + uint32_t fractional_pwm = (dc->dc->config.disable_fractional_pwm == false) ? 1 : 0; + + cmd.abm_set_pwm_frac.header.type = DMUB_CMD__ABM; + cmd.abm_set_pwm_frac.header.sub_type = DMUB_CMD__ABM_SET_PWM_FRAC; + cmd.abm_set_pwm_frac.abm_set_pwm_frac_data.fractional_pwm = fractional_pwm; + cmd.abm_set_pwm_frac.header.payload_bytes = sizeof(struct dmub_cmd_abm_set_pwm_frac_data); + + dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.abm_set_pwm_frac.header); + dc_dmub_srv_cmd_execute(dc->dmub_srv); + dc_dmub_srv_wait_idle(dc->dmub_srv); +} + static void dmub_abm_init(struct abm *abm) { struct dce_abm *dce_abm = TO_DMUB_ABM(abm); @@ -199,6 +214,8 @@ static void dmub_abm_init(struct abm *abm) ABM1_HG_REG_READ_MISSED_FRAME_CLEAR, 1, ABM1_LS_REG_READ_MISSED_FRAME_CLEAR, 1, ABM1_BL_REG_READ_MISSED_FRAME_CLEAR, 1); + + dmub_abm_enable_fractional_pwm(abm->ctx); } static unsigned int dmub_abm_get_current_backlight(struct abm *abm) @@ -259,28 +276,11 @@ static bool dmub_abm_immediate_disable(struct abm *abm) return true; } -static void dmub_abm_enable_fractional_pwm(struct dc_context *dc) -{ - union dmub_rb_cmd cmd; - uint32_t fractional_pwm = (dc->dc->config.disable_fractional_pwm == false) ? 1 : 0; - - cmd.abm_set_pwm_frac.header.type = DMUB_CMD__ABM; - cmd.abm_set_pwm_frac.header.sub_type = DMUB_CMD__ABM_SET_PWM_FRAC; - cmd.abm_set_pwm_frac.abm_set_pwm_frac_data.fractional_pwm = fractional_pwm; - cmd.abm_set_pwm_frac.header.payload_bytes = sizeof(struct dmub_cmd_abm_set_pwm_frac_data); - - dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.abm_set_pwm_frac.header); - dc_dmub_srv_cmd_execute(dc->dmub_srv); - dc_dmub_srv_wait_idle(dc->dmub_srv); -} - static bool dmub_abm_init_backlight(struct abm *abm) { struct dce_abm *dce_abm = TO_DMUB_ABM(abm); uint32_t value; - dmub_abm_enable_fractional_pwm(abm->ctx); - /* It must not be 0, so we have to restore them * Bios bug w/a - period resets to zero, * restoring to cache values which is always correct |