Commit e2fade2c authored by David Miller's avatar David Miller Committed by Paul Mundt
Browse files

svga: Make svga_set_default_gfx_regs take an iomem regbase pointer. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent dc6aff3a

drivers/video/arkfb.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int arkfb_set_par(struct fb_info *info) 
	svga_wcrt_mask(0x17, 0x00, 0x80);



	/* Set default values */

	svga_set_default_gfx_regs();

	svga_set_default_gfx_regs(par->state.vgabase);

	svga_set_default_atc_regs();

	svga_set_default_seq_regs();

	svga_set_default_crt_regs();

drivers/video/s3fb.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int s3fb_set_par(struct fb_info *info) 
	svga_wcrt_mask(0x17, 0x00, 0x80);



	/* Set default values */

	svga_set_default_gfx_regs();

	svga_set_default_gfx_regs(par->state.vgabase);

	svga_set_default_atc_regs();

	svga_set_default_seq_regs();

	svga_set_default_crt_regs();

drivers/video/svgalib.c

+13 −13
Original line number Diff line number Diff line
@@ -75,21 +75,21 @@ static unsigned int svga_regset_size(const struct vga_regset *regset) 




/* Set graphics controller registers to sane values */

void svga_set_default_gfx_regs(void)

void svga_set_default_gfx_regs(void __iomem *regbase)

{

	/* All standard GFX registers (GR00 - GR08) */

	vga_wgfx(NULL, VGA_GFX_SR_VALUE, 0x00);

	vga_wgfx(NULL, VGA_GFX_SR_ENABLE, 0x00);

	vga_wgfx(NULL, VGA_GFX_COMPARE_VALUE, 0x00);

	vga_wgfx(NULL, VGA_GFX_DATA_ROTATE, 0x00);

	vga_wgfx(NULL, VGA_GFX_PLANE_READ, 0x00);

	vga_wgfx(NULL, VGA_GFX_MODE, 0x00);

/*	vga_wgfx(NULL, VGA_GFX_MODE, 0x20); */

/*	vga_wgfx(NULL, VGA_GFX_MODE, 0x40); */

	vga_wgfx(NULL, VGA_GFX_MISC, 0x05);

/*	vga_wgfx(NULL, VGA_GFX_MISC, 0x01); */

	vga_wgfx(NULL, VGA_GFX_COMPARE_MASK, 0x0F);

	vga_wgfx(NULL, VGA_GFX_BIT_MASK, 0xFF);

	vga_wgfx(regbase, VGA_GFX_SR_VALUE, 0x00);

	vga_wgfx(regbase, VGA_GFX_SR_ENABLE, 0x00);

	vga_wgfx(regbase, VGA_GFX_COMPARE_VALUE, 0x00);

	vga_wgfx(regbase, VGA_GFX_DATA_ROTATE, 0x00);

	vga_wgfx(regbase, VGA_GFX_PLANE_READ, 0x00);

	vga_wgfx(regbase, VGA_GFX_MODE, 0x00);

/*	vga_wgfx(regbase, VGA_GFX_MODE, 0x20); */

/*	vga_wgfx(regbase, VGA_GFX_MODE, 0x40); */

	vga_wgfx(regbase, VGA_GFX_MISC, 0x05);

/*	vga_wgfx(regbase, VGA_GFX_MISC, 0x01); */

	vga_wgfx(regbase, VGA_GFX_COMPARE_MASK, 0x0F);

	vga_wgfx(regbase, VGA_GFX_BIT_MASK, 0xFF);

}



/* Set attribute controller registers to sane values */

drivers/video/vt8623fb.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int vt8623fb_set_par(struct fb_info *info) 
	svga_wcrt_mask(0x17, 0x00, 0x80);



	/* Set default values */

	svga_set_default_gfx_regs();

	svga_set_default_gfx_regs(par->state.vgabase);

	svga_set_default_atc_regs();

	svga_set_default_seq_regs();

	svga_set_default_crt_regs();

include/linux/svga.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline int svga_primary_device(struct pci_dev *dev) 
void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);

void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);



void svga_set_default_gfx_regs(void);

void svga_set_default_gfx_regs(void __iomem *regbase);

void svga_set_default_atc_regs(void);

void svga_set_default_seq_regs(void);

void svga_set_default_crt_regs(void);