Commit 6e4f0d39 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Rename register constants for TX-chip types 



The type of the TX chip is provided in VGACRD1. Rename the constants
accordingly.

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

drivers/gpu/drm/ast/ast_main.c

+2 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ static void ast_detect_tx_chip(struct ast_device *ast, bool need_post) 
			ast->tx_chip = AST_TX_DP501;

		}

	} else if (IS_AST_GEN7(ast)) {

		if (ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xD1, TX_TYPE_MASK) ==

		    ASTDP_DPMCU_TX) {

		if (ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd1, AST_IO_VGACRD1_TX_TYPE_MASK) ==

		    AST_IO_VGACRD1_TX_ASTDP) {

			int ret = ast_dp_launch(ast);



			if (!ret)

drivers/gpu/drm/ast/ast_reg.h

+12 −14
Original line number Diff line number Diff line
@@ -38,6 +38,17 @@ 
#define AST_IO_VGACRCB_HWC_ENABLED	BIT(1)



#define AST_IO_VGACRD1_MCU_FW_EXECUTING		BIT(5)

/* Display Transmitter Type */

#define AST_IO_VGACRD1_TX_TYPE_MASK		GENMASK(3, 1)

#define AST_IO_VGACRD1_NO_TX			0x00

#define AST_IO_VGACRD1_TX_ITE66121_VBIOS	0x02

#define AST_IO_VGACRD1_TX_SIL164_VBIOS		0x04

#define AST_IO_VGACRD1_TX_CH7003_VBIOS		0x06

#define AST_IO_VGACRD1_TX_DP501_VBIOS		0x08

#define AST_IO_VGACRD1_TX_ANX9807_VBIOS		0x0a

#define AST_IO_VGACRD1_TX_FW_EMBEDDED_FW	0x0c

#define AST_IO_VGACRD1_TX_ASTDP			0x0e



#define AST_IO_VGACRD7_EDID_VALID_FLAG	BIT(0)

#define AST_IO_VGACRDC_LINK_SUCCESS	BIT(0)

#define AST_IO_VGACRDF_HPD		BIT(0)
@@ -49,19 +60,6 @@ 
#define AST_IO_VGAIR1_R			(0x5A)

#define AST_IO_VGAIR1_VREFRESH		BIT(3)



/*

 * Display Transmitter Type

 */



#define TX_TYPE_MASK			GENMASK(3, 1)

#define NO_TX				(0 << 1)

#define ITE66121_VBIOS_TX		(1 << 1)

#define SI164_VBIOS_TX			(2 << 1)

#define CH7003_VBIOS_TX			(3 << 1)

#define DP501_VBIOS_TX			(4 << 1)

#define ANX9807_VBIOS_TX		(5 << 1)

#define TX_FW_EMBEDDED_FW_TX		(6 << 1)

#define ASTDP_DPMCU_TX			(7 << 1)



#define AST_VRAM_INIT_STATUS_MASK	GENMASK(7, 6)

//#define AST_VRAM_INIT_BY_BMC		BIT(7)