]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/ast: Remove gamma LUT updates from DPMS code
authorThomas Zimmermann <tzimmermann@suse.de>
Thu, 27 Jun 2024 15:27:50 +0000 (17:27 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Wed, 3 Jul 2024 07:38:23 +0000 (09:38 +0200)
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
drivers/gpu/drm/ast/ast_mode.c

index 6a81d657175d41f8f3e3d8e7fd18020cc0b9ef27..e90179bc084274a12210236c6e6ac77308e25280 100644 (file)
@@ -1023,8 +1023,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).
@@ -1033,16 +1031,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: