| Message ID | 20240627153638.8765-6-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/ast: Untangle the chaos in mode setting | expand |
On 27/06/2024 17:27, Thomas Zimmermann wrote: > The DPMS code, called from the CRTC's atomic_enable, rewrites the > gamma LUT. This is already done in the CRTC's atomic_flush. Remove > the duplication. Thanks, it looks good te me. Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/ast/ast_mode.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index 6a81d657175d..e90179bc0842 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -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:
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 6a81d657175d..e90179bc0842 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -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:
The DPMS code, called from the CRTC's atomic_enable, rewrites the gamma LUT. This is already done in the CRTC's atomic_flush. Remove the duplication. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/ast/ast_mode.c | 12 ------------ 1 file changed, 12 deletions(-)