svga: Make svga_set_default_crt_regs() take an iomem regbase pointer.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index f24151e01da35d1c2de982b187419b43524b0852..51fd8affe0c7e95e061fe5d6ac727b81f6736d13 100644 (file)
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -656,7 +656,7 @@ static int arkfb_set_par(struct fb_info *info)
        svga_set_default_gfx_regs(par->state.vgabase);
        svga_set_default_atc_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_start_address_regs, 0);
 

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index ece99f2044f4f1c4272edfb53129e81c867d0f7f..a7a2463663c4f631e8bc47212e42778e79b07e6d 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -517,7 +517,7 @@ static int s3fb_set_par(struct fb_info *info)
        svga_set_default_gfx_regs(par->state.vgabase);
        svga_set_default_atc_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_start_address_regs, 0);
 

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 3d07287e93225250b4baaea181f06bf3c11ce413..b0464977ed9ba794b3c901fa6568e236cea70714 100644 (file)
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -127,14 +127,14 @@ void svga_set_default_seq_regs(void __iomem *regbase)
 }
 
 /* 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 */
-       svga_wcrt_mask(NULL, 0x03, 0x80, 0x80); /* Enable vertical retrace EVRA */
-       vga_wcrt(NULL, VGA_CRTC_PRESET_ROW, 0);
-       svga_wcrt_mask(NULL, VGA_CRTC_MAX_SCAN, 0, 0x1F);
-       vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0);
-       vga_wcrt(NULL, VGA_CRTC_MODE, 0xE3);
+       svga_wcrt_mask(regbase, 0x03, 0x80, 0x80);      /* Enable vertical retrace EVRA */
+       vga_wcrt(regbase, VGA_CRTC_PRESET_ROW, 0);
+       svga_wcrt_mask(regbase, VGA_CRTC_MAX_SCAN, 0, 0x1F);
+       vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0);
+       vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3);
 }
 
 void svga_set_textmode_vga_regs(void)

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index bc54b57db985c92df5aaea17841bae9af1304394..a2624a841eccec86c0e795bb37cd9cd57293cdfc 100644 (file)
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -429,7 +429,7 @@ static int vt8623fb_set_par(struct fb_info *info)
        svga_set_default_gfx_regs(par->state.vgabase);
        svga_set_default_atc_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_start_address_regs, 0);
 

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 5c5b41bddee4bb72c3027c57796ee8d3e29cb0d0..2a32dd55d1a0b39472fd33e956a3e31b7f8d9207 100644 (file)
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -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_atc_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_settile(struct fb_info *info, struct fb_tilemap *map);