aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/arkfb.c2
-rw-r--r--drivers/video/s3fb.c2
-rw-r--r--drivers/video/svgalib.c12
-rw-r--r--drivers/video/vt8623fb.c2
-rw-r--r--include/linux/svga.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 1028e329c46..4cc412126ad 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -655,7 +655,7 @@ static int arkfb_set_par(struct fb_info *info)
655 /* Set default values */ 655 /* Set default values */
656 svga_set_default_gfx_regs(par->state.vgabase); 656 svga_set_default_gfx_regs(par->state.vgabase);
657 svga_set_default_atc_regs(par->state.vgabase); 657 svga_set_default_atc_regs(par->state.vgabase);
658 svga_set_default_seq_regs(); 658 svga_set_default_seq_regs(par->state.vgabase);
659 svga_set_default_crt_regs(); 659 svga_set_default_crt_regs();
660 svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF); 660 svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);
661 svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0); 661 svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0);
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7073cf904cc..f37c38bbe87 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -516,7 +516,7 @@ static int s3fb_set_par(struct fb_info *info)
516 /* Set default values */ 516 /* Set default values */
517 svga_set_default_gfx_regs(par->state.vgabase); 517 svga_set_default_gfx_regs(par->state.vgabase);
518 svga_set_default_atc_regs(par->state.vgabase); 518 svga_set_default_atc_regs(par->state.vgabase);
519 svga_set_default_seq_regs(); 519 svga_set_default_seq_regs(par->state.vgabase);
520 svga_set_default_crt_regs(); 520 svga_set_default_crt_regs();
521 svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF); 521 svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);
522 svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0); 522 svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0);
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 8b97359db50..6d3d39feb89 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -116,14 +116,14 @@ void svga_set_default_atc_regs(void __iomem *regbase)
116} 116}
117 117
118/* Set sequencer registers to sane values */ 118/* Set sequencer registers to sane values */
119void svga_set_default_seq_regs(void) 119void svga_set_default_seq_regs(void __iomem *regbase)
120{ 120{
121 /* Standard sequencer registers (SR01 - SR04), SR00 is not set */ 121 /* Standard sequencer registers (SR01 - SR04), SR00 is not set */
122 vga_wseq(NULL, VGA_SEQ_CLOCK_MODE, VGA_SR01_CHAR_CLK_8DOTS); 122 vga_wseq(regbase, VGA_SEQ_CLOCK_MODE, VGA_SR01_CHAR_CLK_8DOTS);
123 vga_wseq(NULL, VGA_SEQ_PLANE_WRITE, VGA_SR02_ALL_PLANES); 123 vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, VGA_SR02_ALL_PLANES);
124 vga_wseq(NULL, VGA_SEQ_CHARACTER_MAP, 0x00); 124 vga_wseq(regbase, VGA_SEQ_CHARACTER_MAP, 0x00);
125/* vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE | VGA_SR04_CHN_4M); */ 125/* vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE | VGA_SR04_CHN_4M); */
126 vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE); 126 vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE);
127} 127}
128 128
129/* Set CRTC registers to sane values */ 129/* Set CRTC registers to sane values */
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 310af2dc43c..9de76811200 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -427,7 +427,7 @@ static int vt8623fb_set_par(struct fb_info *info)
427 /* Set default values */ 427 /* Set default values */
428 svga_set_default_gfx_regs(par->state.vgabase); 428 svga_set_default_gfx_regs(par->state.vgabase);
429 svga_set_default_atc_regs(par->state.vgabase); 429 svga_set_default_atc_regs(par->state.vgabase);
430 svga_set_default_seq_regs(); 430 svga_set_default_seq_regs(par->state.vgabase);
431 svga_set_default_crt_regs(); 431 svga_set_default_crt_regs();
432 svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF); 432 svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);
433 svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); 433 svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
diff --git a/include/linux/svga.h b/include/linux/svga.h
index 87a41641cae..d31a3984401 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -101,7 +101,7 @@ void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32
101 101
102void svga_set_default_gfx_regs(void __iomem *regbase); 102void svga_set_default_gfx_regs(void __iomem *regbase);
103void svga_set_default_atc_regs(void __iomem *regbase); 103void svga_set_default_atc_regs(void __iomem *regbase);
104void svga_set_default_seq_regs(void); 104void svga_set_default_seq_regs(void __iomem *regbase);
105void svga_set_default_crt_regs(void); 105void svga_set_default_crt_regs(void);
106void svga_set_textmode_vga_regs(void); 106void svga_set_textmode_vga_regs(void);
107 107