tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240916082920.56234-2-tzimmermann@suse.de
+14
-16
+2
-2
drivers/gpu/drm/ast/ast_main.c
+2
-2
drivers/gpu/drm/ast/ast_main.c
···
120
120
ast->tx_chip = AST_TX_DP501;
121
121
}
122
122
} else if (IS_AST_GEN7(ast)) {
123
-
if (ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xD1, TX_TYPE_MASK) ==
124
-
ASTDP_DPMCU_TX) {
123
+
if (ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd1, AST_IO_VGACRD1_TX_TYPE_MASK) ==
124
+
AST_IO_VGACRD1_TX_ASTDP) {
125
125
int ret = ast_dp_launch(ast);
126
126
127
127
if (!ret)
+12
-14
drivers/gpu/drm/ast/ast_reg.h
+12
-14
drivers/gpu/drm/ast/ast_reg.h
···
37
37
#define AST_IO_VGACRCB_HWC_16BPP BIT(0) /* set: ARGB4444, cleared: 2bpp palette */
38
38
#define AST_IO_VGACRCB_HWC_ENABLED BIT(1)
39
39
40
-
#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5)
40
+
#define AST_IO_VGACRD1_MCU_FW_EXECUTING BIT(5)
41
+
/* Display Transmitter Type */
42
+
#define AST_IO_VGACRD1_TX_TYPE_MASK GENMASK(3, 1)
43
+
#define AST_IO_VGACRD1_NO_TX 0x00
44
+
#define AST_IO_VGACRD1_TX_ITE66121_VBIOS 0x02
45
+
#define AST_IO_VGACRD1_TX_SIL164_VBIOS 0x04
46
+
#define AST_IO_VGACRD1_TX_CH7003_VBIOS 0x06
47
+
#define AST_IO_VGACRD1_TX_DP501_VBIOS 0x08
48
+
#define AST_IO_VGACRD1_TX_ANX9807_VBIOS 0x0a
49
+
#define AST_IO_VGACRD1_TX_FW_EMBEDDED_FW 0x0c
50
+
#define AST_IO_VGACRD1_TX_ASTDP 0x0e
51
+
41
52
#define AST_IO_VGACRD7_EDID_VALID_FLAG BIT(0)
42
53
#define AST_IO_VGACRDC_LINK_SUCCESS BIT(0)
43
54
#define AST_IO_VGACRDF_HPD BIT(0)
···
60
49
#define AST_IO_VGAIR1_R (0x5A)
61
50
#define AST_IO_VGAIR1_VREFRESH BIT(3)
62
51
63
-
/*
64
-
* Display Transmitter Type
65
-
*/
66
-
67
-
#define TX_TYPE_MASK GENMASK(3, 1)
68
-
#define NO_TX (0 << 1)
69
-
#define ITE66121_VBIOS_TX (1 << 1)
70
-
#define SI164_VBIOS_TX (2 << 1)
71
-
#define CH7003_VBIOS_TX (3 << 1)
72
-
#define DP501_VBIOS_TX (4 << 1)
73
-
#define ANX9807_VBIOS_TX (5 << 1)
74
-
#define TX_FW_EMBEDDED_FW_TX (6 << 1)
75
-
#define ASTDP_DPMCU_TX (7 << 1)
76
52
77
53
#define AST_VRAM_INIT_STATUS_MASK GENMASK(7, 6)
78
54
//#define AST_VRAM_INIT_BY_BMC BIT(7)