Commit 1d28fcad authored by David Miller's avatar David Miller Committed by Paul Mundt

svga: Make svga_set_default_crt_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 ea770789
...@@ -656,7 +656,7 @@ static int arkfb_set_par(struct fb_info *info) ...@@ -656,7 +656,7 @@ static int arkfb_set_par(struct fb_info *info)
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(par->state.vgabase); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs(par->state.vgabase);
svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0);
......
...@@ -517,7 +517,7 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -517,7 +517,7 @@ static int s3fb_set_par(struct fb_info *info)
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(par->state.vgabase); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs(par->state.vgabase);
svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0);
......
...@@ -127,14 +127,14 @@ void svga_set_default_seq_regs(void __iomem *regbase) ...@@ -127,14 +127,14 @@ void svga_set_default_seq_regs(void __iomem *regbase)
} }
/* Set CRTC registers to sane values */ /* Set CRTC registers to sane values */
void svga_set_default_crt_regs(void) void svga_set_default_crt_regs(void __iomem *regbase)
{ {
/* Standard CRT registers CR03 CR08 CR09 CR14 CR17 */ /* Standard CRT registers CR03 CR08 CR09 CR14 CR17 */
svga_wcrt_mask(NULL, 0x03, 0x80, 0x80); /* Enable vertical retrace EVRA */ svga_wcrt_mask(regbase, 0x03, 0x80, 0x80); /* Enable vertical retrace EVRA */
vga_wcrt(NULL, VGA_CRTC_PRESET_ROW, 0); vga_wcrt(regbase, VGA_CRTC_PRESET_ROW, 0);
svga_wcrt_mask(NULL, VGA_CRTC_MAX_SCAN, 0, 0x1F); svga_wcrt_mask(regbase, VGA_CRTC_MAX_SCAN, 0, 0x1F);
vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0); vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0);
vga_wcrt(NULL, VGA_CRTC_MODE, 0xE3); vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3);
} }
void svga_set_textmode_vga_regs(void) void svga_set_textmode_vga_regs(void)
......
...@@ -429,7 +429,7 @@ static int vt8623fb_set_par(struct fb_info *info) ...@@ -429,7 +429,7 @@ static int vt8623fb_set_par(struct fb_info *info)
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(par->state.vgabase); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs(par->state.vgabase);
svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
......
...@@ -102,7 +102,7 @@ void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 ...@@ -102,7 +102,7 @@ void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32
void svga_set_default_gfx_regs(void __iomem *regbase); void svga_set_default_gfx_regs(void __iomem *regbase);
void svga_set_default_atc_regs(void __iomem *regbase); void svga_set_default_atc_regs(void __iomem *regbase);
void svga_set_default_seq_regs(void __iomem *regbase); void svga_set_default_seq_regs(void __iomem *regbase);
void svga_set_default_crt_regs(void); void svga_set_default_crt_regs(void __iomem *regbase);
void svga_set_textmode_vga_regs(void); void svga_set_textmode_vga_regs(void);
void svga_settile(struct fb_info *info, struct fb_tilemap *map); void svga_settile(struct fb_info *info, struct fb_tilemap *map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment