Commit 7b8a74bc authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Program mode for AST DP in atomic_mode_set 



The CRTC's atomic_flush function contains code to program the
display mode to the AST DP chip. Move the code to the encoder's
atomic_mode_set callback. The DRM atomic-modesetting code invoke
this callback as part of the atomic commit.

v2:
- fix typos in commit message

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240627153638.8765-3-tzimmermann@suse.de
parent 2a7e5f45

drivers/gpu/drm/ast/ast_mode.c

+12 −5
Original line number Diff line number Diff line
@@ -1190,7 +1190,6 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc, 
	struct drm_device *dev = crtc->dev;

	struct ast_device *ast = to_ast_device(dev);

	struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);

	struct ast_vbios_mode_info *vbios_mode_info = &ast_crtc_state->vbios_mode_info;



	/*

	 * The gamma LUT has to be reloaded after changing the primary
@@ -1204,10 +1203,6 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc, 
		else

			ast_crtc_set_gamma_linear(ast, ast_crtc_state->format);

	}



	//Set Aspeed Display-Port

	if (ast->tx_chip_types & AST_TX_ASTDP_BIT)

		ast_dp_set_mode(crtc, vbios_mode_info);

}



static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state)
@@ -1635,6 +1630,17 @@ static const struct drm_encoder_funcs ast_astdp_encoder_funcs = { 
	.destroy = drm_encoder_cleanup,

};



static void ast_astdp_encoder_helper_atomic_mode_set(struct drm_encoder *encoder,

						     struct drm_crtc_state *crtc_state,

						     struct drm_connector_state *conn_state)

{

	struct drm_crtc *crtc = crtc_state->crtc;

	struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);

	struct ast_vbios_mode_info *vbios_mode_info = &ast_crtc_state->vbios_mode_info;



	ast_dp_set_mode(crtc, vbios_mode_info);

}



static void ast_astdp_encoder_helper_atomic_enable(struct drm_encoder *encoder,

						   struct drm_atomic_state *state)

{
@@ -1656,6 +1662,7 @@ static void ast_astdp_encoder_helper_atomic_disable(struct drm_encoder *encoder, 
}



static const struct drm_encoder_helper_funcs ast_astdp_encoder_helper_funcs = {

	.atomic_mode_set = ast_astdp_encoder_helper_atomic_mode_set,

	.atomic_enable = ast_astdp_encoder_helper_atomic_enable,

	.atomic_disable = ast_astdp_encoder_helper_atomic_disable,

};