1 files changed, 26 insertions, 22 deletions

diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index 23d70a12e4da..64b35766b2a2 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -36,16 +36,16 @@
      */
 
 static void
-bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                unsigned n, int bits, u32 bswapmask)
+bitfill_aligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                unsigned long pat, unsigned n, int bits, u32 bswapmask)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = fb_shifted_pixels_mask_long(dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long((dst_idx+n) % bits, bswapmask);
+        first = fb_shifted_pixels_mask_long(p, dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, (dst_idx+n) % bits, bswapmask);
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -93,16 +93,16 @@ bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                        int left, int right, unsigned n, int bits)
+bitfill_unaligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                  unsigned long pat, int left, int right, unsigned n, int bits)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -147,8 +147,9 @@ bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      *  Aligned pattern invert using 32/64-bit memory accesses
      */
 static void
-bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                unsigned n, int bits, u32 bswapmask)
+bitfill_aligned_rev(struct fb_info *p, unsigned long __iomem *dst,
+                    int dst_idx, unsigned long pat, unsigned n, int bits,
+                    u32 bswapmask)
 {
         unsigned long val = pat, dat;
         unsigned long first, last;
@@ -156,8 +157,8 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
         if (!n)
                 return;
 
-        first = fb_shifted_pixels_mask_long(dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long((dst_idx+n) % bits, bswapmask);
+        first = fb_shifted_pixels_mask_long(p, dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, (dst_idx+n) % bits, bswapmask);
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -217,16 +218,17 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                        int left, int right, unsigned n, int bits)
+bitfill_unaligned_rev(struct fb_info *p, unsigned long __iomem *dst,
+                      int dst_idx, unsigned long pat, int left, int right,
+                      unsigned n, int bits)
 {
         unsigned long first, last, dat;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -306,7 +308,8 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 p->fbops->fb_sync(p);
         if (!left) {
                 u32 bswapmask = fb_compute_bswapmask(p);
-                void (*fill_op32)(unsigned long __iomem *dst, int dst_idx,
+                void (*fill_op32)(struct fb_info *p,
+                                  unsigned long __iomem *dst, int dst_idx,
                                   unsigned long pat, unsigned n, int bits,
                                   u32 bswapmask) = NULL;
 
@@ -325,16 +328,17 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op32(dst, dst_idx, pat, width*bpp, bits, bswapmask);
+                        fill_op32(p, dst, dst_idx, pat, width*bpp, bits,
+                                  bswapmask);
                         dst_idx += p->fix.line_length*8;
                 }
         } else {
                 int right;
                 int r;
                 int rot = (left-dst_idx) % bpp;
-                void (*fill_op)(unsigned long __iomem *dst, int dst_idx,
-                                unsigned long pat, int left, int right,
-                                unsigned n, int bits) = NULL;
+                void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst,
+                                int dst_idx, unsigned long pat, int left,
+                                int right, unsigned n, int bits) = NULL;
 
                 /* rotate pattern to correct start position */
                 pat = pat << rot | pat >> (bpp-rot);
@@ -355,7 +359,7 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op(dst, dst_idx, pat, left, right,
+                        fill_op(p, dst, dst_idx, pat, left, right,
                                 width*bpp, bits);
                         r = (p->fix.line_length*8) % bpp;
                         pat = pat << (bpp-r) | pat >> r;