[PATCH] fbdev: Batch cmap changes at driver level

This patch adds to the fbdev interface a set_cmap callback that allow the
driver to "batch" palette changes.  This is useful for drivers like
radeonfb which might require lenghtly workarounds on palette accesses, thus
allowing to factor out those workarounds efficiently.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index e8eb124754b13616b37a1ea0c595a48571180d10..ee25b9e8db60992fd8a6e6d041dc12fb49775a44 100644 (file)
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1057,13 +1057,14 @@ static int radeonfb_blank (int blank, struct fb_info *info)
        return radeon_screen_blank(rinfo, blank, 0);
 }
 
-static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
-                             unsigned blue, unsigned transp, struct fb_info *info)
+static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
+                             unsigned blue, unsigned transp,
+                            struct radeonfb_info *rinfo)
 {
-        struct radeonfb_info *rinfo = info->par;
        u32 pindex;
        unsigned int i;
-       
+
+
        if (regno > 255)
                return 1;
 
@@ -1078,20 +1079,7 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
         pindex = regno;
 
         if (!rinfo->asleep) {
-               u32 dac_cntl2, vclk_cntl = 0;
-               
                radeon_fifo_wait(9);
-               if (rinfo->is_mobility) {
-                       vclk_cntl = INPLL(VCLK_ECP_CNTL);
-                       OUTPLL(VCLK_ECP_CNTL, vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
-               }
-
-               /* Make sure we are on first palette */
-               if (rinfo->has_CRTC2) {
-                       dac_cntl2 = INREG(DAC_CNTL2);
-                       dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
-                       OUTREG(DAC_CNTL2, dac_cntl2);
-               }
 
                if (rinfo->bpp == 16) {
                        pindex = regno * 8;
@@ -1101,24 +1089,27 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
                        if (rinfo->depth == 15 && regno > 31)
                                return 1;
 
-                       /* For 565, the green component is mixed one order below */
+                       /* For 565, the green component is mixed one order
+                        * below
+                        */
                        if (rinfo->depth == 16) {
                                OUTREG(PALETTE_INDEX, pindex>>1);
-                               OUTREG(PALETTE_DATA, (rinfo->palette[regno>>1].red << 16) |
-                                       (green << 8) | (rinfo->palette[regno>>1].blue));
+                               OUTREG(PALETTE_DATA,
+                                      (rinfo->palette[regno>>1].red << 16) |
+                                       (green << 8) |
+                                      (rinfo->palette[regno>>1].blue));
                                green = rinfo->palette[regno<<1].green;
                        }
                }
 
                if (rinfo->depth != 16 || regno < 32) {
                        OUTREG(PALETTE_INDEX, pindex);
-                       OUTREG(PALETTE_DATA, (red << 16) | (green << 8) | blue);
+                       OUTREG(PALETTE_DATA, (red << 16) |
+                              (green << 8) | blue);
                }
-               if (rinfo->is_mobility)
-                       OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
        }
        if (regno < 16) {
-               u32 *pal = info->pseudo_palette;
+               u32 *pal = rinfo->info->pseudo_palette;
                switch (rinfo->depth) {
                case 15:
                        pal[regno] = (regno << 10) | (regno << 5) | regno;
@@ -1138,6 +1129,84 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
        return 0;
 }
 
+static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
+                              unsigned blue, unsigned transp,
+                              struct fb_info *info)
+{
+        struct radeonfb_info *rinfo = info->par;
+       u32 dac_cntl2, vclk_cntl = 0;
+       int rc;
+
+        if (!rinfo->asleep) {
+               if (rinfo->is_mobility) {
+                       vclk_cntl = INPLL(VCLK_ECP_CNTL);
+                       OUTPLL(VCLK_ECP_CNTL,
+                              vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
+               }
+
+               /* Make sure we are on first palette */
+               if (rinfo->has_CRTC2) {
+                       dac_cntl2 = INREG(DAC_CNTL2);
+                       dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
+                       OUTREG(DAC_CNTL2, dac_cntl2);
+               }
+       }
+
+       rc = radeon_setcolreg (regno, red, green, blue, transp, rinfo);
+
+       if (!rinfo->asleep && rinfo->is_mobility)
+               OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
+
+       return rc;
+}
+
+static int radeonfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        struct radeonfb_info *rinfo = info->par;
+       u16 *red, *green, *blue, *transp;
+       u32 dac_cntl2, vclk_cntl = 0;
+       int i, start, rc = 0;
+
+        if (!rinfo->asleep) {
+               if (rinfo->is_mobility) {
+                       vclk_cntl = INPLL(VCLK_ECP_CNTL);
+                       OUTPLL(VCLK_ECP_CNTL,
+                              vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
+               }
+
+               /* Make sure we are on first palette */
+               if (rinfo->has_CRTC2) {
+                       dac_cntl2 = INREG(DAC_CNTL2);
+                       dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
+                       OUTREG(DAC_CNTL2, dac_cntl2);
+               }
+       }
+
+       red = cmap->red;
+       green = cmap->green;
+       blue = cmap->blue;
+       transp = cmap->transp;
+       start = cmap->start;
+
+       for (i = 0; i < cmap->len; i++) {
+               u_int hred, hgreen, hblue, htransp = 0xffff;
+
+               hred = *red++;
+               hgreen = *green++;
+               hblue = *blue++;
+               if (transp)
+                       htransp = *transp++;
+               rc = radeon_setcolreg (start++, hred, hgreen, hblue, htransp,
+                                      rinfo);
+               if (rc)
+                       break;
+       }
+
+       if (!rinfo->asleep && rinfo->is_mobility)
+               OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
+
+       return rc;
+}
 
 static void radeon_save_state (struct radeonfb_info *rinfo,
                               struct radeon_regs *save)
@@ -1796,6 +1865,7 @@ static struct fb_ops radeonfb_ops = {
        .fb_check_var           = radeonfb_check_var,
        .fb_set_par             = radeonfb_set_par,
        .fb_setcolreg           = radeonfb_setcolreg,
+       .fb_setcmap             = radeonfb_setcmap,
        .fb_pan_display         = radeonfb_pan_display,
        .fb_blank               = radeonfb_blank,
        .fb_ioctl               = radeonfb_ioctl,

diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index c51f8fb5c1de50c6b61ffad823165eea0d27d96e..4e5ce8f7d65e263144f387d2db97e843aed4f493 100644 (file)
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -222,8 +222,11 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info)
        transp = cmap->transp;
        start = cmap->start;
 
-       if (start < 0 || !info->fbops->fb_setcolreg)
+       if (start < 0 || (!info->fbops->fb_setcolreg &&
+                         !info->fbops->fb_setcmap))
                return -EINVAL;
+       if (info->fbops->fb_setcmap)
+               return info->fbops->fb_setcmap(cmap, info);
        for (i = 0; i < cmap->len; i++) {
                hred = *red++;
                hgreen = *green++;
@@ -250,8 +253,33 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
        transp = cmap->transp;
        start = cmap->start;
 
-       if (start < 0 || !info->fbops->fb_setcolreg)
+       if (start < 0 || (!info->fbops->fb_setcolreg &&
+                         !info->fbops->fb_setcmap))
                return -EINVAL;
+
+       /* If we can batch, do it */
+       if (info->fbops->fb_setcmap && cmap->len > 1) {
+               struct fb_cmap umap;
+               int size = cmap->len * sizeof(u16);
+               int rc;
+
+               memset(&umap, 0, sizeof(struct fb_cmap));
+               rc = fb_alloc_cmap(&umap, cmap->len, transp != NULL);
+               if (rc)
+                       return rc;
+               if (copy_from_user(umap.red, red, size) ||
+                   copy_from_user(umap.green, green, size) ||
+                   copy_from_user(umap.blue, blue, size) ||
+                   (transp && copy_from_user(umap.transp, transp, size))) {
+                       rc = -EFAULT;
+               }
+               umap.start = start;
+               if (rc == 0)
+                       rc = info->fbops->fb_setcmap(&umap, info);
+               fb_dealloc_cmap(&umap);
+               return rc;
+       }
+
        for (i = 0; i < cmap->len; i++, red++, blue++, green++) {
                if (get_user(hred, red) ||
                    get_user(hgreen, green) ||

diff --git a/include/linux/fb.h b/include/linux/fb.h
index b45d3e2d711a38a2af3f7b633c372f7b25eb956c..b468bf49654782d1d7cc6e6f12dc79d04fd34325 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -563,6 +563,9 @@ struct fb_ops {
        int (*fb_setcolreg)(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp, struct fb_info *info);
 
+       /* set color registers in batch */
+       int (*fb_setcmap)(struct fb_cmap *cmap, struct fb_info *info);
+
        /* blank display */
        int (*fb_blank)(int blank, struct fb_info *info);