drm/ast: Remove gamma LUT updates from DPMS code
BugLink: https://bugs.launchpad.net/bugs/2083022 The DPMS code, called from the CRTC's atomic_enable, rewrites the gamma LUT. This is already done by the CRTC's atomic_flush. Remove the duplication. v2: - fix a typo in commit message Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240627153638.8765-6-tzimmermann@suse.de (cherry picked from commit bb5367d17e83af95b56d2cc455a09316d6ff3349) Signed-off-by: Aaron Ma <aaron.ma@canonical.com> Acked-by: Guoqing Jiang <guoqing.jiang@canonical.com> Acked-by: Ivan Hu <ivan.hu@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
96d5631dc6
commit
7e0f181e67
@@ -1005,8 +1005,6 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||
{
|
||||
struct ast_device *ast = to_ast_device(crtc->dev);
|
||||
u8 ch = AST_DPMS_VSYNC_OFF | AST_DPMS_HSYNC_OFF;
|
||||
struct ast_crtc_state *ast_state;
|
||||
const struct drm_format_info *format;
|
||||
|
||||
/* TODO: Maybe control display signal generation with
|
||||
* Sync Enable (bit CR17.7).
|
||||
@@ -1015,16 +1013,6 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||
case DRM_MODE_DPMS_ON:
|
||||
ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, 0);
|
||||
ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, 0);
|
||||
|
||||
ast_state = to_ast_crtc_state(crtc->state);
|
||||
format = ast_state->format;
|
||||
|
||||
if (format) {
|
||||
if (crtc->state->gamma_lut)
|
||||
ast_crtc_set_gamma(ast, format, crtc->state->gamma_lut->data);
|
||||
else
|
||||
ast_crtc_set_gamma_linear(ast, format);
|
||||
}
|
||||
break;
|
||||
case DRM_MODE_DPMS_STANDBY:
|
||||
case DRM_MODE_DPMS_SUSPEND:
|
||||
|
||||
Reference in New Issue
Block a user