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

drm/ast: Rework definition of I/O read and write helpers 



Ast defines a number of I/O helpers for accessing hardware. Only 4 of
the many generated functions are actually used. Replace the respective
generator macros with those 4 functions. No functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230221155745.27484-3-tzimmermann@suse.de
parent a3841086

drivers/gpu/drm/ast/ast_drv.h

+14 −34
Original line number Diff line number Diff line
@@ -238,46 +238,26 @@ struct ast_private *ast_device_create(const struct drm_driver *drv, 
#define AST_IO_VGACRCB_HWC_ENABLED     BIT(1)

#define AST_IO_VGACRCB_HWC_16BPP       BIT(0) /* set: ARGB4444, cleared: 2bpp palette */



#define __ast_read(x) \

static inline u##x ast_read##x(struct ast_private *ast, u32 reg) { \

u##x val = 0;\

val = ioread##x(ast->regs + reg); \

return val;\

static inline u32 ast_read32(struct ast_private *ast, u32 reg)

{

	return ioread32(ast->regs + reg);

}



__ast_read(8);

__ast_read(16);

__ast_read(32)



#define __ast_io_read(x) \

static inline u##x ast_io_read##x(struct ast_private *ast, u32 reg) { \

u##x val = 0;\

val = ioread##x(ast->ioregs + reg); \

return val;\

static inline void ast_write32(struct ast_private *ast, u32 reg, u32 val)

{

	iowrite32(val, ast->regs + reg);

}



__ast_io_read(8);

__ast_io_read(16);

__ast_io_read(32);



#define __ast_write(x) \

static inline void ast_write##x(struct ast_private *ast, u32 reg, u##x val) {\

	iowrite##x(val, ast->regs + reg);\

static inline u8 ast_io_read8(struct ast_private *ast, u32 reg)

{

	return ioread8(ast->ioregs + reg);

}



__ast_write(8);

__ast_write(16);

__ast_write(32);



#define __ast_io_write(x) \

static inline void ast_io_write##x(struct ast_private *ast, u32 reg, u##x val) {\

	iowrite##x(val, ast->ioregs + reg);\

static inline void ast_io_write8(struct ast_private *ast, u32 reg, u8 val)

{

	iowrite8(val, ast->ioregs + reg);

}



__ast_io_write(8);

__ast_io_write(16);

#undef __ast_io_write



static inline void ast_set_index_reg(struct ast_private *ast,

				     uint32_t base, uint8_t index,

				     uint8_t val)