Commit 224bf236 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Rename AST_IO_INPUT_STATUS1_READ to AST_IO_VGAIR1_R 



Rename AST_IO_INPUT_STATUS1_READ to AST_IO_VGAIR1_R to align naming
in the driver with documentation. No functional changes.

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

drivers/gpu/drm/ast/ast_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static inline bool __ast_gen_is_eq(struct ast_device *ast, unsigned long gen) 
#define AST_IO_VGAPDR		        (0x49)

#define AST_IO_VGAGRI			(0x4E)

#define AST_IO_VGACRI			(0x54)

#define AST_IO_INPUT_STATUS1_READ	(0x5A)

#define AST_IO_VGAIR1_R			(0x5A)

#define AST_IO_MISC_PORT_READ		(0x4C)



#define AST_IO_MM_OFFSET		(0x380)

drivers/gpu/drm/ast/ast_mode.c

+3 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static void ast_set_std_reg(struct ast_device *ast, 
		ast_set_index_reg(ast, AST_IO_VGACRI, i, stdtable->crtc[i]);



	/* set AR */

	jreg = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);

	jreg = ast_io_read8(ast, AST_IO_VGAIR1_R);

	for (i = 0; i < 20; i++) {

		jreg = stdtable->ar[i];

		ast_io_write8(ast, AST_IO_VGAARI_W, (u8)i);
@@ -327,7 +327,7 @@ static void ast_set_std_reg(struct ast_device *ast, 
	ast_io_write8(ast, AST_IO_VGAARI_W, 0x14);

	ast_io_write8(ast, AST_IO_VGAARI_W, 0x00);



	jreg = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);

	jreg = ast_io_read8(ast, AST_IO_VGAIR1_R);

	ast_io_write8(ast, AST_IO_VGAARI_W, 0x20);



	/* Set GR */
@@ -558,7 +558,7 @@ static void ast_wait_for_vretrace(struct ast_device *ast) 
	u8 vgair1;



	do {

		vgair1 = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);

		vgair1 = ast_io_read8(ast, AST_IO_VGAIR1_R);

	} while (!(vgair1 & AST_IO_VGAIR1_VREFRESH) && time_before(jiffies, timeout));

}