Commit 8c3b7d27 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: astdp: Inline mode-index calculation 



Programming the astdp transmitter chip requires a magic value for
individual modes. Inline the helper for calculating the value into
its only caller (i.e., the encoder's atomic_mode_set).

With further refactoring, the atomic check will be able to detect
invalid modes before attempting to program them.

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

drivers/gpu/drm/ast/ast_dp.c

+21 −31
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ to_ast_astdp_connector_state(const struct drm_connector_state *state) 
	return container_of(state, struct ast_astdp_connector_state, base);

}



static int __ast_astdp_get_mode_index(unsigned int hdisplay, unsigned int vdisplay)

static int ast_astdp_get_mode_index(unsigned int hdisplay, unsigned int vdisplay)

{

	const struct ast_astdp_mode_index_table_entry *entry = ast_astdp_mode_index_table;
@@ -65,35 +65,6 @@ static int __ast_astdp_get_mode_index(unsigned int hdisplay, unsigned int vdispl 
	return -EINVAL;

}



static int ast_astdp_get_mode_index(const struct ast_vbios_enhtable *vmode)

{

	int mode_index;

	u8 refresh_rate_index;



	mode_index = __ast_astdp_get_mode_index(vmode->hde, vmode->vde);

	if (mode_index < 0)

		return mode_index;



	if (vmode->refresh_rate_index < 1 || vmode->refresh_rate_index > 255)

		return -EINVAL;

	refresh_rate_index = vmode->refresh_rate_index - 1;



	/* FIXME: Why are we doing this? */

	switch (mode_index) {

	case ASTDP_1280x800_60_RB:

	case ASTDP_1440x900_60_RB:

	case ASTDP_1600x900_60_RB:

	case ASTDP_1680x1050_60_RB:

		mode_index = (u8)(mode_index - (u8)refresh_rate_index);

		break;

	default:

		mode_index = (u8)(mode_index + (u8)refresh_rate_index);

		break;

	}



	return mode_index;

}



static bool ast_astdp_is_connected(struct ast_device *ast)

{

	if (!ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xDF, AST_IO_VGACRDF_HPD))
@@ -333,13 +304,32 @@ static void ast_astdp_encoder_helper_atomic_mode_set(struct drm_encoder *encoder 
	struct drm_device *dev = encoder->dev;

	struct ast_device *ast = to_ast_device(dev);

	struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);

	const struct ast_vbios_enhtable *vmode = ast_crtc_state->vmode;

	int mode_index;

	u8 refresh_rate_index;

	u8 vgacre0, vgacre1, vgacre2;



	mode_index = ast_astdp_get_mode_index(ast_crtc_state->vmode);

	mode_index = ast_astdp_get_mode_index(vmode->hde, vmode->vde);

	if (drm_WARN_ON(dev, mode_index < 0))

		return;



	if (drm_WARN_ON(dev, vmode->refresh_rate_index < 1 || vmode->refresh_rate_index > 255))

		return;

	refresh_rate_index = vmode->refresh_rate_index - 1;



	/* FIXME: Why are we doing this? */

	switch (mode_index) {

	case ASTDP_1280x800_60_RB:

	case ASTDP_1440x900_60_RB:

	case ASTDP_1600x900_60_RB:

	case ASTDP_1680x1050_60_RB:

		mode_index = (u8)(mode_index - (u8)refresh_rate_index);

		break;

	default:

		mode_index = (u8)(mode_index + (u8)refresh_rate_index);

		break;

	}



	/*

	 * CRE0[7:0]: MISC0 ((0x00: 18-bpp) or (0x20: 24-bpp)

	 * CRE1[7:0]: MISC1 (default: 0x00)