diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:49:34 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:46:44 -0400 |
commit | 21da386d0e4c55f6f7482b4637532b942e22b70a (patch) | |
tree | 47bebd65b27086a9cd1ba0ee2f241234ba53b902 /drivers/video/arkfb.c | |
parent | f6b0cc477de99fe715f1071b13ab822daed9a34f (diff) |
svga: Make svga_wcrt_multi take an iomem regbase pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/arkfb.c')
-rw-r--r-- | drivers/video/arkfb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 391ac939f011..a54dbf4c7836 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c | |||
@@ -657,8 +657,8 @@ static int arkfb_set_par(struct fb_info *info) | |||
657 | svga_set_default_atc_regs(); | 657 | svga_set_default_atc_regs(); |
658 | svga_set_default_seq_regs(); | 658 | svga_set_default_seq_regs(); |
659 | svga_set_default_crt_regs(); | 659 | svga_set_default_crt_regs(); |
660 | svga_wcrt_multi(ark_line_compare_regs, 0xFFFFFFFF); | 660 | svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF); |
661 | svga_wcrt_multi(ark_start_address_regs, 0); | 661 | svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0); |
662 | 662 | ||
663 | /* ARK specific initialization */ | 663 | /* ARK specific initialization */ |
664 | svga_wseq_mask(0x10, 0x1F, 0x1F); /* enable linear framebuffer and full memory access */ | 664 | svga_wseq_mask(0x10, 0x1F, 0x1F); /* enable linear framebuffer and full memory access */ |
@@ -676,7 +676,7 @@ static int arkfb_set_par(struct fb_info *info) | |||
676 | 676 | ||
677 | /* Set the offset register */ | 677 | /* Set the offset register */ |
678 | pr_debug("fb%d: offset register : %d\n", info->node, offset_value); | 678 | pr_debug("fb%d: offset register : %d\n", info->node, offset_value); |
679 | svga_wcrt_multi(ark_offset_regs, offset_value); | 679 | svga_wcrt_multi(par->state.vgabase, ark_offset_regs, offset_value); |
680 | 680 | ||
681 | /* fix for hi-res textmode */ | 681 | /* fix for hi-res textmode */ |
682 | svga_wcrt_mask(0x40, 0x08, 0x08); | 682 | svga_wcrt_mask(0x40, 0x08, 0x08); |
@@ -884,6 +884,7 @@ static int arkfb_blank(int blank_mode, struct fb_info *info) | |||
884 | 884 | ||
885 | static int arkfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | 885 | static int arkfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) |
886 | { | 886 | { |
887 | struct arkfb_info *par = info->par; | ||
887 | unsigned int offset; | 888 | unsigned int offset; |
888 | 889 | ||
889 | /* Calculate the offset */ | 890 | /* Calculate the offset */ |
@@ -897,7 +898,7 @@ static int arkfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info | |||
897 | } | 898 | } |
898 | 899 | ||
899 | /* Set the offset */ | 900 | /* Set the offset */ |
900 | svga_wcrt_multi(ark_start_address_regs, offset); | 901 | svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, offset); |
901 | 902 | ||
902 | return 0; | 903 | return 0; |
903 | } | 904 | } |