aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/svgalib.c8
-rw-r--r--drivers/video/vt8623fb.c2
-rw-r--r--include/linux/svga.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index bf3c7a92eeab..ed190aa09653 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -40,12 +40,12 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32
40} 40}
41 41
42/* Write a sequencer register value spread across multiple registers */ 42/* Write a sequencer register value spread across multiple registers */
43void svga_wseq_multi(const struct vga_regset *regset, u32 value) { 43void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value)
44 44{
45 u8 regval, bitval, bitnum; 45 u8 regval, bitval, bitnum;
46 46
47 while (regset->regnum != VGA_REGSET_END_VAL) { 47 while (regset->regnum != VGA_REGSET_END_VAL) {
48 regval = vga_rseq(NULL, regset->regnum); 48 regval = vga_rseq(regbase, regset->regnum);
49 bitnum = regset->lowbit; 49 bitnum = regset->lowbit;
50 while (bitnum <= regset->highbit) { 50 while (bitnum <= regset->highbit) {
51 bitval = 1 << bitnum; 51 bitval = 1 << bitnum;
@@ -54,7 +54,7 @@ void svga_wseq_multi(const struct vga_regset *regset, u32 value) {
54 bitnum ++; 54 bitnum ++;
55 value = value >> 1; 55 value = value >> 1;
56 } 56 }
57 vga_wseq(NULL, regset->regnum, regval); 57 vga_wseq(regbase, regset->regnum, regval);
58 regset ++; 58 regset ++;
59 } 59 }
60} 60}
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 46f8e06a55e8..f303ea0341bc 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -433,7 +433,7 @@ static int vt8623fb_set_par(struct fb_info *info)
433 svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); 433 svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
434 434
435 svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value); 435 svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value);
436 svga_wseq_multi(vt8623_fetch_count_regs, fetch_value); 436 svga_wseq_multi(par->state.vgabase, vt8623_fetch_count_regs, fetch_value);
437 437
438 /* Clear H/V Skew */ 438 /* Clear H/V Skew */
439 svga_wcrt_mask(0x03, 0x00, 0x60); 439 svga_wcrt_mask(0x03, 0x00, 0x60);
diff --git a/include/linux/svga.h b/include/linux/svga.h
index 8ca81e0b0a6c..357e2bdac9aa 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -97,7 +97,7 @@ static inline int svga_primary_device(struct pci_dev *dev)
97 97
98 98
99void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value); 99void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
100void svga_wseq_multi(const struct vga_regset *regset, u32 value); 100void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
101 101
102void svga_set_default_gfx_regs(void); 102void svga_set_default_gfx_regs(void);
103void svga_set_default_atc_regs(void); 103void svga_set_default_atc_regs(void);