Commit b3945edd authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Rename AST_IO_MISC_PORT_WRITE to AST_IO_VGAMR_W 



Rename AST_IO_MISC_PORT_WRITE to AST_IO_VGAMR_W 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-3-tzimmermann@suse.de
parent 53f410d3

drivers/gpu/drm/ast/ast_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static inline bool __ast_gen_is_eq(struct ast_device *ast, unsigned long gen) 
#define IS_AST_GEN7(__ast)	__ast_gen_is_eq(__ast, 7)



#define AST_IO_VGAARI_W			(0x40)

#define AST_IO_MISC_PORT_WRITE		(0x42)

#define AST_IO_VGAMR_W			(0x42)

#define AST_IO_VGA_ENABLE_PORT		(0x43)

#define AST_IO_SEQ_PORT			(0x44)

#define AST_IO_DAC_INDEX_READ		(0x47)

drivers/gpu/drm/ast/ast_main.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void ast_enable_vga(struct drm_device *dev) 
	struct ast_device *ast = to_ast_device(dev);



	ast_io_write8(ast, AST_IO_VGA_ENABLE_PORT, 0x01);

	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, 0x01);

	ast_io_write8(ast, AST_IO_VGAMR_W, 0x01);

}



/*

drivers/gpu/drm/ast/ast_mode.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void ast_set_std_reg(struct ast_device *ast, 
	stdtable = vbios_mode->std_table;



	jreg = stdtable->misc;

	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);

	ast_io_write8(ast, AST_IO_VGAMR_W, jreg);



	/* Set SEQ; except Screen Disable field */

	ast_set_index_reg(ast, AST_IO_SEQ_PORT, 0x00, 0x03);
@@ -537,7 +537,7 @@ static void ast_set_sync_reg(struct ast_device *ast, 
		jreg |= 0x80;

	if (vbios_mode->enh_table->flags & NHSync)

		jreg |= 0x40;

	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);

	ast_io_write8(ast, AST_IO_VGAMR_W, jreg);

}



static void ast_set_start_address_crt1(struct ast_device *ast,