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/vt8623fb.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/vt8623fb.c')
-rw-r--r-- | drivers/video/vt8623fb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index a2965ab92cfb..46f8e06a55e8 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
@@ -373,6 +373,7 @@ static int vt8623fb_check_var(struct fb_var_screeninfo *var, struct fb_info *inf | |||
373 | static int vt8623fb_set_par(struct fb_info *info) | 373 | static int vt8623fb_set_par(struct fb_info *info) |
374 | { | 374 | { |
375 | u32 mode, offset_value, fetch_value, screen_size; | 375 | u32 mode, offset_value, fetch_value, screen_size; |
376 | struct vt8623fb_info *par = info->par; | ||
376 | u32 bpp = info->var.bits_per_pixel; | 377 | u32 bpp = info->var.bits_per_pixel; |
377 | 378 | ||
378 | if (bpp != 0) { | 379 | if (bpp != 0) { |
@@ -428,10 +429,10 @@ static int vt8623fb_set_par(struct fb_info *info) | |||
428 | svga_set_default_atc_regs(); | 429 | svga_set_default_atc_regs(); |
429 | svga_set_default_seq_regs(); | 430 | svga_set_default_seq_regs(); |
430 | svga_set_default_crt_regs(); | 431 | svga_set_default_crt_regs(); |
431 | svga_wcrt_multi(vt8623_line_compare_regs, 0xFFFFFFFF); | 432 | svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF); |
432 | svga_wcrt_multi(vt8623_start_address_regs, 0); | 433 | svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); |
433 | 434 | ||
434 | svga_wcrt_multi(vt8623_offset_regs, offset_value); | 435 | svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value); |
435 | svga_wseq_multi(vt8623_fetch_count_regs, fetch_value); | 436 | svga_wseq_multi(vt8623_fetch_count_regs, fetch_value); |
436 | 437 | ||
437 | /* Clear H/V Skew */ | 438 | /* Clear H/V Skew */ |
@@ -603,6 +604,7 @@ static int vt8623fb_blank(int blank_mode, struct fb_info *info) | |||
603 | 604 | ||
604 | static int vt8623fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | 605 | static int vt8623fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) |
605 | { | 606 | { |
607 | struct vt8623fb_info *par = info->par; | ||
606 | unsigned int offset; | 608 | unsigned int offset; |
607 | 609 | ||
608 | /* Calculate the offset */ | 610 | /* Calculate the offset */ |
@@ -616,7 +618,7 @@ static int vt8623fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *i | |||
616 | } | 618 | } |
617 | 619 | ||
618 | /* Set the offset */ | 620 | /* Set the offset */ |
619 | svga_wcrt_multi(vt8623_start_address_regs, offset); | 621 | svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, offset); |
620 | 622 | ||
621 | return 0; | 623 | return 0; |
622 | } | 624 | } |