dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

svga: Make svga_set_default_gfx_regs take an iomem regbase pointer. 

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
David Miller 2011-01-11 23:50:04 +00:00 committed by Paul Mundt
parent dc6aff3a5d
commit e2fade2c14
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/arkfb.c
View File

@ -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();

2
drivers/video/s3fb.c
View File

@ -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();

26
drivers/video/svgalib.c
View File

@ -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 */

2
drivers/video/vt8623fb.c
View File

@ -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();

2
include/linux/svga.h
View File

@ -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);