redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

svga: Make svga_set_default_atc_regs take an iomem regbase pointer. 

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
hifive-unleashed-5.1
David Miller 2011-01-11 23:50:36 +00:00 committed by Paul Mundt
parent e2fade2c14
commit f51a14dded
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/arkfb.c
View File

@ -654,7 +654,7 @@ static int arkfb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs();
svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);

2
drivers/video/s3fb.c
View File

@ -515,7 +515,7 @@ static int s3fb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs();
svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);

24
drivers/video/svgalib.c
View File

@ -93,26 +93,26 @@ void svga_set_default_gfx_regs(void __iomem *regbase)
}
/* Set attribute controller registers to sane values */
void svga_set_default_atc_regs(void)
void svga_set_default_atc_regs(void __iomem *regbase)
{
u8 count;
vga_r(NULL, 0x3DA);
vga_w(NULL, VGA_ATT_W, 0x00);
vga_r(regbase, 0x3DA);
vga_w(regbase, VGA_ATT_W, 0x00);
/* All standard ATC registers (AR00 - AR14) */
for (count = 0; count <= 0xF; count ++)
svga_wattr(NULL, count, count);
svga_wattr(regbase, count, count);
svga_wattr(NULL, VGA_ATC_MODE, 0x01);
/* svga_wattr(NULL, VGA_ATC_MODE, 0x41); */
svga_wattr(NULL, VGA_ATC_OVERSCAN, 0x00);
svga_wattr(NULL, VGA_ATC_PLANE_ENABLE, 0x0F);
svga_wattr(NULL, VGA_ATC_PEL, 0x00);
svga_wattr(NULL, VGA_ATC_COLOR_PAGE, 0x00);
svga_wattr(regbase, VGA_ATC_MODE, 0x01);
/* svga_wattr(regbase, VGA_ATC_MODE, 0x41); */
svga_wattr(regbase, VGA_ATC_OVERSCAN, 0x00);
svga_wattr(regbase, VGA_ATC_PLANE_ENABLE, 0x0F);
svga_wattr(regbase, VGA_ATC_PEL, 0x00);
svga_wattr(regbase, VGA_ATC_COLOR_PAGE, 0x00);
vga_r(NULL, 0x3DA);
vga_w(NULL, VGA_ATT_W, 0x20);
vga_r(regbase, 0x3DA);
vga_w(regbase, VGA_ATT_W, 0x20);
}
/* Set sequencer registers to sane values */

2
drivers/video/vt8623fb.c
View File

@ -426,7 +426,7 @@ static int vt8623fb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs();
svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);

2
include/linux/svga.h
View File

@ -100,7 +100,7 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32
void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
void svga_set_default_gfx_regs(void __iomem *regbase);
void svga_set_default_atc_regs(void);
void svga_set_default_atc_regs(void __iomem *regbase);
void svga_set_default_seq_regs(void);
void svga_set_default_crt_regs(void);
void svga_set_textmode_vga_regs(void);