Commit dc6aff3a authored by David Miller's avatar David Miller Committed by Paul Mundt

svga: Make svga_wseq_multi 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 21da386d
...@@ -40,12 +40,12 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 ...@@ -40,12 +40,12 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32
} }
/* Write a sequencer register value spread across multiple registers */ /* Write a sequencer register value spread across multiple registers */
void svga_wseq_multi(const struct vga_regset *regset, u32 value) { void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value)
{
u8 regval, bitval, bitnum; u8 regval, bitval, bitnum;
while (regset->regnum != VGA_REGSET_END_VAL) { while (regset->regnum != VGA_REGSET_END_VAL) {
regval = vga_rseq(NULL, regset->regnum); regval = vga_rseq(regbase, regset->regnum);
bitnum = regset->lowbit; bitnum = regset->lowbit;
while (bitnum <= regset->highbit) { while (bitnum <= regset->highbit) {
bitval = 1 << bitnum; bitval = 1 << bitnum;
...@@ -54,7 +54,7 @@ void svga_wseq_multi(const struct vga_regset *regset, u32 value) { ...@@ -54,7 +54,7 @@ void svga_wseq_multi(const struct vga_regset *regset, u32 value) {
bitnum ++; bitnum ++;
value = value >> 1; value = value >> 1;
} }
vga_wseq(NULL, regset->regnum, regval); vga_wseq(regbase, regset->regnum, regval);
regset ++; regset ++;
} }
} }
......
...@@ -433,7 +433,7 @@ static int vt8623fb_set_par(struct fb_info *info) ...@@ -433,7 +433,7 @@ static int vt8623fb_set_par(struct fb_info *info)
svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value); svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value);
svga_wseq_multi(vt8623_fetch_count_regs, fetch_value); svga_wseq_multi(par->state.vgabase, vt8623_fetch_count_regs, fetch_value);
/* Clear H/V Skew */ /* Clear H/V Skew */
svga_wcrt_mask(0x03, 0x00, 0x60); svga_wcrt_mask(0x03, 0x00, 0x60);
......
...@@ -97,7 +97,7 @@ static inline int svga_primary_device(struct pci_dev *dev) ...@@ -97,7 +97,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_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
void svga_wseq_multi(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);
void svga_set_default_atc_regs(void); void svga_set_default_atc_regs(void);
......
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