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>

diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index a54dbf4c7836329480a0f0a1a04785796b45616b..e09694f58c2c70cd7ace820e2ee9baba27888bef 100644 (file)
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -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();

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 3984dcf7ba675087067b817e10c3b5b37dee9c1d..7e34e5a163c4b599d633f76f83a817ccaee5a3f9 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -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();

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index ed190aa09653b753c3dc2966f2d714736efd65c8..25f9f87f73dd8ec0650386bac4363e9c2d9f6935 100644 (file)
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -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 */

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index f303ea0341bc7b8a170954a33f0ce0472855b347..ccb4a3e78fda349cc7f56ed6d6d887e58dc83459 100644 (file)
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -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();

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 357e2bdac9aa9332789eae05a36dbfda3f2b283f..4591032247f207b93446f5baaa74487ca9c91d6d 100644 (file)
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -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);