nfsd4: reshuffle lease-setting code to allow reuse
[safe/jmp/linux-2.6] / drivers / video / pm3fb.c
index 5b3f54c..6666f45 100644 (file)
@@ -32,6 +32,9 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
 
 #include <video/pm3fb.h>
 
 
 #undef PM3FB_MASTER_DEBUG
 #ifdef PM3FB_MASTER_DEBUG
-#define DPRINTK(a,b...)        printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)
+#define DPRINTK(a, b...)       \
+       printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
 #else
-#define DPRINTK(a,b...)
+#define DPRINTK(a, b...)
 #endif
 
+#define PM3_PIXMAP_SIZE        (2048 * 4)
+
 /*
  * Driver data
  */
+static int hwcursor = 1;
 static char *mode_option __devinitdata;
+static int noaccel __devinitdata;
+
+/* mtrr option */
+#ifdef CONFIG_MTRR
+static int nomtrr __devinitdata;
+#endif
 
 /*
  * This structure defines the hardware state of the graphics card. Normally
@@ -61,8 +74,9 @@ static char *mode_option __devinitdata;
 struct pm3_par {
        unsigned char   __iomem *v_regs;/* virtual address of p_regs */
        u32             video;          /* video flags before blanking */
-       u32             base;           /* screen base (xoffset+yoffset) in 128 bits unit */
+       u32             base;           /* screen base in 128 bits unit */
        u32             palette[16];
+       int             mtrr_handle;
 };
 
 /*
@@ -96,7 +110,8 @@ static inline void PM3_WRITE_REG(struct pm3_par *par, s32 off, u32 v)
 
 static inline void PM3_WAIT(struct pm3_par *par, u32 n)
 {
-       while (PM3_READ_REG(par, PM3InFIFOSpace) < n);
+       while (PM3_READ_REG(par, PM3InFIFOSpace) < n)
+               cpu_relax();
 }
 
 static inline void PM3_WRITE_DAC_REG(struct pm3_par *par, unsigned r, u8 v)
@@ -133,7 +148,7 @@ static void pm3fb_clear_colormap(struct pm3_par *par,
 
 }
 
-/* Calculating various clock parameter */
+/* Calculating various clock parameters */
 static void pm3fb_calculate_clock(unsigned long reqclock,
                                unsigned char *prescale,
                                unsigned char *feedback,
@@ -164,7 +179,7 @@ static void pm3fb_calculate_clock(unsigned long reqclock,
 
 static inline int pm3fb_depth(const struct fb_var_screeninfo *var)
 {
-       if ( var->bits_per_pixel == 16 )
+       if (var->bits_per_pixel == 16)
                return var->red.length + var->green.length
                        + var->blue.length;
 
@@ -195,8 +210,8 @@ static int pm3fb_sync(struct fb_info *info)
        PM3_WRITE_REG(par, PM3Sync, 0);
        mb();
        do {
-               while ((PM3_READ_REG(par, PM3OutFIFOWords)) == 0);
-               rmb();
+               while ((PM3_READ_REG(par, PM3OutFIFOWords)) == 0)
+                       cpu_relax();
        } while ((PM3_READ_REG(par, PM3OutputFifo)) != PM3Sync_Tag);
 
        return 0;
@@ -276,15 +291,22 @@ static void pm3fb_init_engine(struct fb_info *info)
 
        PM3_WAIT(par, 2);
        {
-               unsigned long rm = 1;
+               /* invert bits in bitmask */
+               unsigned long rm = 1 | (3 << 7);
                switch (info->var.bits_per_pixel) {
                case 8:
                        PM3_WRITE_REG(par, PM3PixelSize,
                                           PM3PixelSize_GLOBAL_8BIT);
+#ifdef __BIG_ENDIAN
+                       rm |= 3 << 15;
+#endif
                        break;
                case 16:
                        PM3_WRITE_REG(par, PM3PixelSize,
                                           PM3PixelSize_GLOBAL_16BIT);
+#ifdef __BIG_ENDIAN
+                       rm |= 2 << 15;
+#endif
                        break;
                case 32:
                        PM3_WRITE_REG(par, PM3PixelSize,
@@ -342,7 +364,7 @@ static void pm3fb_init_engine(struct fb_info *info)
 
        PM3_WRITE_REG(par, PM3dXDom, 0x0);
        PM3_WRITE_REG(par, PM3dXSub, 0x0);
-       PM3_WRITE_REG(par, PM3dY, (1 << 16));
+       PM3_WRITE_REG(par, PM3dY, 1 << 16);
        PM3_WRITE_REG(par, PM3StartXDom, 0x0);
        PM3_WRITE_REG(par, PM3StartXSub, 0x0);
        PM3_WRITE_REG(par, PM3StartY, 0x0);
@@ -357,71 +379,352 @@ static void pm3fb_init_engine(struct fb_info *info)
        pm3fb_sync(info);
 }
 
-static void pm3fb_fillrect (struct fb_info *info,
+static void pm3fb_fillrect(struct fb_info *info,
                                const struct fb_fillrect *region)
 {
        struct pm3_par *par = info->par;
        struct fb_fillrect modded;
        int vxres, vyres;
+       int rop;
        u32 color = (info->fix.visual == FB_VISUAL_TRUECOLOR) ?
-               ((u32*)info->pseudo_palette)[region->color] : region->color;
+               ((u32 *)info->pseudo_palette)[region->color] : region->color;
 
        if (info->state != FBINFO_STATE_RUNNING)
                return;
-       if ((info->flags & FBINFO_HWACCEL_DISABLED) ||
-               region->rop != ROP_COPY ) {
+       if (info->flags & FBINFO_HWACCEL_DISABLED) {
                cfb_fillrect(info, region);
                return;
        }
+       if (region->rop == ROP_COPY )
+               rop = PM3Config2D_ForegroundROP(0x3); /* GXcopy */
+       else
+               rop = PM3Config2D_ForegroundROP(0x6) | /* GXxor */
+                       PM3Config2D_FBDestReadEnable;
 
        vxres = info->var.xres_virtual;
        vyres = info->var.yres_virtual;
 
        memcpy(&modded, region, sizeof(struct fb_fillrect));
 
-       if(!modded.width || !modded.height ||
-          modded.dx >= vxres || modded.dy >= vyres)
+       if (!modded.width || !modded.height ||
+           modded.dx >= vxres || modded.dy >= vyres)
                return;
 
-       if(modded.dx + modded.width  > vxres)
+       if (modded.dx + modded.width  > vxres)
                modded.width  = vxres - modded.dx;
-       if(modded.dy + modded.height > vyres)
+       if (modded.dy + modded.height > vyres)
                modded.height = vyres - modded.dy;
 
-       if(info->var.bits_per_pixel == 8)
+       if (info->var.bits_per_pixel == 8)
                color |= color << 8;
-       if(info->var.bits_per_pixel <= 16)
+       if (info->var.bits_per_pixel <= 16)
                color |= color << 16;
 
        PM3_WAIT(par, 4);
-
+       /* ROP Ox3 is GXcopy */
        PM3_WRITE_REG(par, PM3Config2D,
-                                 PM3Config2D_UseConstantSource |
-                                 PM3Config2D_ForegroundROPEnable |
-                                 (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                 PM3Config2D_FBWriteEnable);
+                       PM3Config2D_UseConstantSource |
+                       PM3Config2D_ForegroundROPEnable |
+                       rop |
+                       PM3Config2D_FBWriteEnable);
 
        PM3_WRITE_REG(par, PM3ForegroundColor, color);
 
        PM3_WRITE_REG(par, PM3RectanglePosition,
-                     (PM3RectanglePosition_XOffset(modded.dx)) |
-                     (PM3RectanglePosition_YOffset(modded.dy)));
+                       PM3RectanglePosition_XOffset(modded.dx) |
+                       PM3RectanglePosition_YOffset(modded.dy));
 
        PM3_WRITE_REG(par, PM3Render2D,
                      PM3Render2D_XPositive |
                      PM3Render2D_YPositive |
                      PM3Render2D_Operation_Normal |
                      PM3Render2D_SpanOperation |
-                     (PM3Render2D_Width(modded.width)) |
-                     (PM3Render2D_Height(modded.height)));
+                     PM3Render2D_Width(modded.width) |
+                     PM3Render2D_Height(modded.height));
+}
+
+static void pm3fb_copyarea(struct fb_info *info,
+                               const struct fb_copyarea *area)
+{
+       struct pm3_par *par = info->par;
+       struct fb_copyarea modded;
+       u32 vxres, vyres;
+       int x_align, o_x, o_y;
+
+       if (info->state != FBINFO_STATE_RUNNING)
+               return;
+       if (info->flags & FBINFO_HWACCEL_DISABLED) {
+               cfb_copyarea(info, area);
+               return;
+       }
+
+       memcpy(&modded, area, sizeof(struct fb_copyarea));
+
+       vxres = info->var.xres_virtual;
+       vyres = info->var.yres_virtual;
+
+       if (!modded.width || !modded.height ||
+           modded.sx >= vxres || modded.sy >= vyres ||
+           modded.dx >= vxres || modded.dy >= vyres)
+               return;
+
+       if (modded.sx + modded.width > vxres)
+               modded.width = vxres - modded.sx;
+       if (modded.dx + modded.width > vxres)
+               modded.width = vxres - modded.dx;
+       if (modded.sy + modded.height > vyres)
+               modded.height = vyres - modded.sy;
+       if (modded.dy + modded.height > vyres)
+               modded.height = vyres - modded.dy;
+
+       o_x = modded.sx - modded.dx;    /*(sx > dx ) ? (sx - dx) : (dx - sx); */
+       o_y = modded.sy - modded.dy;    /*(sy > dy ) ? (sy - dy) : (dy - sy); */
+
+       x_align = (modded.sx & 0x1f);
+
+       PM3_WAIT(par, 6);
+
+       PM3_WRITE_REG(par, PM3Config2D,
+                       PM3Config2D_UserScissorEnable |
+                       PM3Config2D_ForegroundROPEnable |
+                       PM3Config2D_Blocking |
+                       PM3Config2D_ForegroundROP(0x3) | /* Ox3 is GXcopy */
+                       PM3Config2D_FBWriteEnable);
+
+       PM3_WRITE_REG(par, PM3ScissorMinXY,
+                       ((modded.dy & 0x0fff) << 16) | (modded.dx & 0x0fff));
+       PM3_WRITE_REG(par, PM3ScissorMaxXY,
+                       (((modded.dy + modded.height) & 0x0fff) << 16) |
+                       ((modded.dx + modded.width) & 0x0fff));
+
+       PM3_WRITE_REG(par, PM3FBSourceReadBufferOffset,
+                       PM3FBSourceReadBufferOffset_XOffset(o_x) |
+                       PM3FBSourceReadBufferOffset_YOffset(o_y));
+
+       PM3_WRITE_REG(par, PM3RectanglePosition,
+                       PM3RectanglePosition_XOffset(modded.dx - x_align) |
+                       PM3RectanglePosition_YOffset(modded.dy));
+
+       PM3_WRITE_REG(par, PM3Render2D,
+                       ((modded.sx > modded.dx) ? PM3Render2D_XPositive : 0) |
+                       ((modded.sy > modded.dy) ? PM3Render2D_YPositive : 0) |
+                       PM3Render2D_Operation_Normal |
+                       PM3Render2D_SpanOperation |
+                       PM3Render2D_FBSourceReadEnable |
+                       PM3Render2D_Width(modded.width + x_align) |
+                       PM3Render2D_Height(modded.height));
+}
+
+static void pm3fb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+       struct pm3_par *par = info->par;
+       u32 height = image->height;
+       u32 fgx, bgx;
+       const u32 *src = (const u32 *)image->data;
+
+       if (info->state != FBINFO_STATE_RUNNING)
+               return;
+       if (info->flags & FBINFO_HWACCEL_DISABLED) {
+               cfb_imageblit(info, image);
+               return;
+       }
+       switch (info->fix.visual) {
+       case FB_VISUAL_PSEUDOCOLOR:
+               fgx = image->fg_color;
+               bgx = image->bg_color;
+               break;
+       case FB_VISUAL_TRUECOLOR:
+       default:
+               fgx = par->palette[image->fg_color];
+               bgx = par->palette[image->bg_color];
+               break;
+       }
+       if (image->depth != 1) {
+               cfb_imageblit(info, image);
+               return;
+       }
+
+       if (info->var.bits_per_pixel == 8) {
+               fgx |= fgx << 8;
+               bgx |= bgx << 8;
+       }
+       if (info->var.bits_per_pixel <= 16) {
+               fgx |= fgx << 16;
+               bgx |= bgx << 16;
+       }
+
+       PM3_WAIT(par, 7);
+
+       PM3_WRITE_REG(par, PM3ForegroundColor, fgx);
+       PM3_WRITE_REG(par, PM3BackgroundColor, bgx);
+
+       /* ROP Ox3 is GXcopy */
+       PM3_WRITE_REG(par, PM3Config2D,
+                       PM3Config2D_UserScissorEnable |
+                       PM3Config2D_UseConstantSource |
+                       PM3Config2D_ForegroundROPEnable |
+                       PM3Config2D_ForegroundROP(0x3) |
+                       PM3Config2D_OpaqueSpan |
+                       PM3Config2D_FBWriteEnable);
+       PM3_WRITE_REG(par, PM3ScissorMinXY,
+                       ((image->dy & 0x0fff) << 16) | (image->dx & 0x0fff));
+       PM3_WRITE_REG(par, PM3ScissorMaxXY,
+                       (((image->dy + image->height) & 0x0fff) << 16) |
+                       ((image->dx + image->width) & 0x0fff));
+       PM3_WRITE_REG(par, PM3RectanglePosition,
+                       PM3RectanglePosition_XOffset(image->dx) |
+                       PM3RectanglePosition_YOffset(image->dy));
+       PM3_WRITE_REG(par, PM3Render2D,
+                       PM3Render2D_XPositive |
+                       PM3Render2D_YPositive |
+                       PM3Render2D_Operation_SyncOnBitMask |
+                       PM3Render2D_SpanOperation |
+                       PM3Render2D_Width(image->width) |
+                       PM3Render2D_Height(image->height));
+
+
+       while (height--) {
+               int width = ((image->width + 7) >> 3)
+                               + info->pixmap.scan_align - 1;
+               width >>= 2;
+
+               while (width >= PM3_FIFO_SIZE) {
+                       int i = PM3_FIFO_SIZE - 1;
+
+                       PM3_WAIT(par, PM3_FIFO_SIZE);
+                       while (i--) {
+                               PM3_WRITE_REG(par, PM3BitMaskPattern, *src);
+                               src++;
+                       }
+                       width -= PM3_FIFO_SIZE - 1;
+               }
+
+               PM3_WAIT(par, width + 1);
+               while (width--) {
+                       PM3_WRITE_REG(par, PM3BitMaskPattern, *src);
+                       src++;
+               }
+       }
 }
 /* end of acceleration functions */
 
+/*
+ *     Hardware Cursor support.
+ */
+static const u8 cursor_bits_lookup[16] = {
+       0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54,
+       0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55
+};
+
+static int pm3fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+       struct pm3_par *par = info->par;
+       u8 mode;
+
+       if (!hwcursor)
+               return -EINVAL; /* just to force soft_cursor() call */
+
+       /* Too large of a cursor or wrong bpp :-( */
+       if (cursor->image.width > 64 ||
+           cursor->image.height > 64 ||
+           cursor->image.depth > 1)
+               return -EINVAL;
+
+       mode = PM3RD_CursorMode_TYPE_X;
+       if (cursor->enable)
+                mode |= PM3RD_CursorMode_CURSOR_ENABLE;
+
+       PM3_WRITE_DAC_REG(par, PM3RD_CursorMode, mode);
+
+       /*
+        * If the cursor is not be changed this means either we want the
+        * current cursor state (if enable is set) or we want to query what
+        * we can do with the cursor (if enable is not set)
+        */
+       if (!cursor->set)
+               return 0;
+
+       if (cursor->set & FB_CUR_SETPOS) {
+               int x = cursor->image.dx - info->var.xoffset;
+               int y = cursor->image.dy - info->var.yoffset;
+
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorXLow, x & 0xff);
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorXHigh, (x >> 8) & 0xf);
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorYLow, y & 0xff);
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorYHigh, (y >> 8) & 0xf);
+       }
+
+       if (cursor->set & FB_CUR_SETHOT) {
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorHotSpotX,
+                                 cursor->hot.x & 0x3f);
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorHotSpotY,
+                                 cursor->hot.y & 0x3f);
+       }
+
+       if (cursor->set & FB_CUR_SETCMAP) {
+               u32 fg_idx = cursor->image.fg_color;
+               u32 bg_idx = cursor->image.bg_color;
+               struct fb_cmap cmap = info->cmap;
+
+               /* the X11 driver says one should use these color registers */
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(39),
+                                 cmap.red[fg_idx] >> 8 );
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(40),
+                                 cmap.green[fg_idx] >> 8 );
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(41),
+                                 cmap.blue[fg_idx] >> 8 );
+
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(42),
+                                 cmap.red[bg_idx] >> 8 );
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(43),
+                                 cmap.green[bg_idx] >> 8 );
+               PM3_WRITE_DAC_REG(par, PM3RD_CursorPalette(44),
+                                 cmap.blue[bg_idx] >> 8 );
+       }
+
+       if (cursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
+               u8 *bitmap = (u8 *)cursor->image.data;
+               u8 *mask = (u8 *)cursor->mask;
+               int i;
+               int pos = PM3RD_CursorPattern(0);
+
+               for (i = 0; i < cursor->image.height; i++) {
+                       int j = (cursor->image.width + 7) >> 3;
+                       int k = 8 - j;
+
+                       for (; j > 0; j--) {
+                               u8 data = *bitmap ^ *mask;
+
+                               if (cursor->rop == ROP_COPY)
+                                       data = *mask & *bitmap;
+                               /* Upper 4 bits of bitmap data */
+                               PM3_WRITE_DAC_REG(par, pos++,
+                                       cursor_bits_lookup[data >> 4] |
+                                       (cursor_bits_lookup[*mask >> 4] << 1));
+                               /* Lower 4 bits of bitmap */
+                               PM3_WRITE_DAC_REG(par, pos++,
+                                       cursor_bits_lookup[data & 0xf] |
+                                       (cursor_bits_lookup[*mask & 0xf] << 1));
+                               bitmap++;
+                               mask++;
+                       }
+                       for (; k > 0; k--) {
+                               PM3_WRITE_DAC_REG(par, pos++, 0);
+                               PM3_WRITE_DAC_REG(par, pos++, 0);
+                       }
+               }
+               while (pos < PM3RD_CursorPattern(1024))
+                       PM3_WRITE_DAC_REG(par, pos++, 0);
+       }
+       return 0;
+}
+
 /* write the mode to registers */
 static void pm3fb_write_mode(struct fb_info *info)
 {
        struct pm3_par *par = info->par;
-       char tempsync = 0x00, tempmisc = 0x00;
+       char tempsync = 0x00;
+       char tempmisc = 0x00;
        const u32 hsstart = info->var.right_margin;
        const u32 hsend = hsstart + info->var.hsync_len;
        const u32 hbend = hsend + info->var.left_margin;
@@ -618,47 +921,57 @@ static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        unsigned bpp = var->red.length + var->green.length
                        + var->blue.length + var->transp.length;
 
-       if ( bpp != var->bits_per_pixel ) {
+       if (bpp != var->bits_per_pixel) {
                /* set predefined mode for bits_per_pixel settings */
 
-               switch(var->bits_per_pixel) {
+               switch (var->bits_per_pixel) {
                case 8:
-                       var->red.length = var->green.length = var->blue.length = 8;
-                       var->red.offset = var->green.offset = var->blue.offset = 0;
+                       var->red.length = 8;
+                       var->green.length = 8;
+                       var->blue.length = 8;
+                       var->red.offset = 0;
+                       var->green.offset = 0;
+                       var->blue.offset = 0;
                        var->transp.offset = 0;
                        var->transp.length = 0;
                        break;
                case 16:
-                       var->red.length = var->blue.length = 5;
+                       var->red.length = 5;
+                       var->blue.length = 5;
                        var->green.length = 6;
                        var->transp.length = 0;
                        break;
                case 32:
-                       var->red.length = var->green.length = var->blue.length = 8;
+                       var->red.length = 8;
+                       var->green.length = 8;
+                       var->blue.length = 8;
                        var->transp.length = 8;
                        break;
                default:
-                       DPRINTK("depth not supported: %u\n", var->bits_per_pixel);
+                       DPRINTK("depth not supported: %u\n",
+                               var->bits_per_pixel);
                        return -EINVAL;
                }
        }
        /* it is assumed BGRA order */
-       if (var->bits_per_pixel > 8 )
-       {
+       if (var->bits_per_pixel > 8 ) {
                var->blue.offset = 0;
                var->green.offset = var->blue.length;
                var->red.offset = var->green.offset + var->green.length;
                var->transp.offset = var->red.offset + var->red.length;
        }
-       var->height = var->width = -1;
+       var->height = -1;
+       var->width = -1;
 
        if (var->xres != var->xres_virtual) {
-               DPRINTK("virtual x resolution != physical x resolution not supported\n");
+               DPRINTK("virtual x resolution != "
+                       "physical x resolution not supported\n");
                return -EINVAL;
        }
 
        if (var->yres > var->yres_virtual) {
-               DPRINTK("virtual y resolution < physical y resolution not possible\n");
+               DPRINTK("virtual y resolution < "
+                       "physical y resolution not possible\n");
                return -EINVAL;
        }
 
@@ -673,7 +986,7 @@ static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        }
 
        var->xres = (var->xres + 31) & ~31; /* could sometimes be 8 */
-       lpitch = var->xres * ((var->bits_per_pixel + 7)>>3);
+       lpitch = var->xres * ((var->bits_per_pixel + 7) >> 3);
 
        if (var->xres < 200 || var->xres > 2048) {
                DPRINTK("width not supported: %u\n", var->xres);
@@ -692,7 +1005,8 @@ static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        }
 
        if (PICOS2KHZ(var->pixclock) > PM3_MAX_PIXCLOCK) {
-               DPRINTK("pixclock too high (%ldKHz)\n", PICOS2KHZ(var->pixclock));
+               DPRINTK("pixclock too high (%ldKHz)\n",
+                       PICOS2KHZ(var->pixclock));
                return -EINVAL;
        }
 
@@ -709,7 +1023,7 @@ static int pm3fb_set_par(struct fb_info *info)
        const u32 xres = (info->var.xres + 31) & ~31;
        const unsigned bpp = info->var.bits_per_pixel;
 
-       par->base = pm3fb_shift_bpp(bpp,(info->var.yoffset * xres)
+       par->base = pm3fb_shift_bpp(bpp, (info->var.yoffset * xres)
                                        + info->var.xoffset);
        par->video = 0;
 
@@ -725,15 +1039,12 @@ static int pm3fb_set_par(struct fb_info *info)
 
        if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
                par->video |= PM3VideoControl_LINE_DOUBLE_ON;
-       else
-               par->video |= PM3VideoControl_LINE_DOUBLE_OFF;
 
        if ((info->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
                par->video |= PM3VideoControl_ENABLE;
-       else {
-               par->video |= PM3VideoControl_DISABLE;
+       else
                DPRINTK("PM3Video disabled\n");
-       }
+
        switch (bpp) {
        case 8:
                par->video |= PM3VideoControl_PIXELSIZE_8BIT;
@@ -751,13 +1062,11 @@ static int pm3fb_set_par(struct fb_info *info)
 
        info->fix.visual =
                (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
-       info->fix.line_length = ((info->var.xres_virtual + 7)  & ~7)
-                                       * bpp / 8;
+       info->fix.line_length = ((info->var.xres_virtual + 7)  >> 3) * bpp;
 
 /*     pm3fb_clear_memory(info, 0);*/
        pm3fb_clear_colormap(par, 0, 0, 0);
-       PM3_WRITE_DAC_REG(par, PM3RD_CursorMode,
-                         PM3RD_CursorMode_CURSOR_DISABLE);
+       PM3_WRITE_DAC_REG(par, PM3RD_CursorMode, 0);
        pm3fb_init_engine(info);
        pm3fb_write_mode(info);
        return 0;
@@ -773,10 +1082,9 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
           return -EINVAL;
 
        /* grayscale works only partially under directcolor */
-       if (info->var.grayscale) {
-          /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+       /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+       if (info->var.grayscale)
           red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
-       }
 
        /* Directcolor:
         *   var->{color}.offset contains start of bitfield
@@ -790,8 +1098,8 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
         *
         * Pseudocolor:
         *      var->{color}.offset is 0
-        *      var->{color}.length contains width of DAC or the number of unique
-        *                      colors available (color depth)
+        *      var->{color}.length contains width of DAC or the number
+        *                      of unique colors available (color depth)
         *      pseudo_palette is not used
         *      RAMDAC[X] is programmed to (red, green, blue)
         *      color depth = var->{color}.length
@@ -801,7 +1109,7 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
         * This is the point where the color is converted to something that
         * is acceptable by the hardware.
         */
-#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
+#define CNVT_TOHW(val, width) ((((val) << (width)) + 0x7FFF - (val)) >> 16)
        red = CNVT_TOHW(red, info->var.red.length);
        green = CNVT_TOHW(green, info->var.green.length);
        blue = CNVT_TOHW(blue, info->var.blue.length);
@@ -825,12 +1133,11 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
                        break;
                case 16:
                case 32:
-                       ((u32*)(info->pseudo_palette))[regno] = v;
+                       ((u32 *)(info->pseudo_palette))[regno] = v;
                        break;
                }
                return 0;
-       }
-       else if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
+       } else if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
                pm3fb_set_color(par, regno, red, green, blue);
 
        return 0;
@@ -871,7 +1178,7 @@ static int pm3fb_blank(int blank_mode, struct fb_info *info)
                video |= PM3VideoControl_ENABLE;
                break;
        case FB_BLANK_NORMAL:
-               video &= ~(PM3VideoControl_ENABLE);
+               video &= ~PM3VideoControl_ENABLE;
                break;
        case FB_BLANK_HSYNC_SUSPEND:
                video &= ~(PM3VideoControl_HSYNC_MASK |
@@ -892,7 +1199,7 @@ static int pm3fb_blank(int blank_mode, struct fb_info *info)
        }
 
        PM3_WAIT(par, 1);
-       PM3_WRITE_REG(par,PM3VideoControl, video);
+       PM3_WRITE_REG(par, PM3VideoControl, video);
        return 0;
 }
 
@@ -907,10 +1214,11 @@ static struct fb_ops pm3fb_ops = {
        .fb_setcolreg   = pm3fb_setcolreg,
        .fb_pan_display = pm3fb_pan_display,
        .fb_fillrect    = pm3fb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
+       .fb_copyarea    = pm3fb_copyarea,
+       .fb_imageblit   = pm3fb_imageblit,
        .fb_blank       = pm3fb_blank,
        .fb_sync        = pm3fb_sync,
+       .fb_cursor      = pm3fb_cursor,
 };
 
 /* ------------------------------------------------------------------------- */
@@ -921,9 +1229,10 @@ static struct fb_ops pm3fb_ops = {
 
 /* mmio register are already mapped when this function is called */
 /* the pm3fb_fix.smem_start is also set */
-static unsigned long pm3fb_size_memory(struct pm3_par *par)
+static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par)
 {
-       unsigned long   memsize = 0, tempBypass, i, temp1, temp2;
+       unsigned long   memsize = 0;
+       unsigned long   tempBypass, i, temp1, temp2;
        unsigned char   __iomem *screen_mem;
 
        pm3fb_fix.smem_len = 64 * 1024l * 1024; /* request full aperture size */
@@ -951,7 +1260,9 @@ static unsigned long pm3fb_size_memory(struct pm3_par *par)
        PM3_WAIT(par, 1);
        PM3_WRITE_REG(par, PM3MemBypassWriteMask, 0xFFFFFFFF);
 
-       /* pm3 split up memory, replicates, and do a lot of nasty stuff IMHO ;-) */
+       /* pm3 split up memory, replicates, and do a lot of
+        * nasty stuff IMHO ;-)
+        */
        for (i = 0; i < 32; i++) {
                fb_writel(i * 0x00345678,
                          (screen_mem + (i * 1048576)));
@@ -1008,8 +1319,9 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
 {
        struct fb_info *info;
        struct pm3_par *par;
-       struct device* device = &dev->dev; /* for pci drivers */
-       int err, retval = -ENXIO;
+       struct device *device = &dev->dev; /* for pci drivers */
+       int err;
+       int retval = -ENXIO;
 
        err = pci_enable_device(dev);
        if (err) {
@@ -1031,6 +1343,10 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
         */
        pm3fb_fix.mmio_start = pci_resource_start(dev, 0);
        pm3fb_fix.mmio_len = PM3_REGS_SIZE;
+#if defined(__BIG_ENDIAN)
+       pm3fb_fix.mmio_start += PM3_REGS_SIZE;
+       DPRINTK("Adjusting register base for big-endian.\n");
+#endif
 
        /* Registers - request region and map it. */
        if (!request_mem_region(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len,
@@ -1047,15 +1363,10 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
                goto err_exit_neither;
        }
 
-#if defined(__BIG_ENDIAN)
-       pm3fb_fix.mmio_start += PM3_REGS_SIZE;
-       DPRINTK("Adjusting register base for big-endian.\n");
-#endif
        /* Linear frame buffer - request region and map it. */
        pm3fb_fix.smem_start = pci_resource_start(dev, 1);
        pm3fb_fix.smem_len = pm3fb_size_memory(par);
-       if (!pm3fb_fix.smem_len)
-       {
+       if (!pm3fb_fix.smem_len) {
                printk(KERN_WARNING "pm3fb: Can't find memory on board.\n");
                goto err_exit_mmio;
        }
@@ -1073,6 +1384,12 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
        }
        info->screen_size = pm3fb_fix.smem_len;
 
+#ifdef CONFIG_MTRR
+       if (!nomtrr)
+               par->mtrr_handle = mtrr_add(pm3fb_fix.smem_start,
+                                               pm3fb_fix.smem_len,
+                                               MTRR_TYPE_WRCOMB, 1);
+#endif
        info->fbops = &pm3fb_ops;
 
        par->video = PM3_READ_REG(par, PM3VideoControl);
@@ -1080,7 +1397,26 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
        info->fix = pm3fb_fix;
        info->pseudo_palette = par->palette;
        info->flags = FBINFO_DEFAULT |
-                       FBINFO_HWACCEL_FILLRECT;/* | FBINFO_HWACCEL_YPAN;*/
+                       FBINFO_HWACCEL_XPAN |
+                       FBINFO_HWACCEL_YPAN |
+                       FBINFO_HWACCEL_COPYAREA |
+                       FBINFO_HWACCEL_IMAGEBLIT |
+                       FBINFO_HWACCEL_FILLRECT;
+
+       if (noaccel) {
+               printk(KERN_DEBUG "disabling acceleration\n");
+               info->flags |= FBINFO_HWACCEL_DISABLED;
+       }
+       info->pixmap.addr = kmalloc(PM3_PIXMAP_SIZE, GFP_KERNEL);
+       if (!info->pixmap.addr) {
+               retval = -ENOMEM;
+               goto err_exit_pixmap;
+       }
+       info->pixmap.size = PM3_PIXMAP_SIZE;
+       info->pixmap.buf_align = 4;
+       info->pixmap.scan_align = 4;
+       info->pixmap.access_align = 32;
+       info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
        /*
         * This should give a reasonable default video mode. The following is
@@ -1118,6 +1454,8 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
  err_exit_all:
        fb_dealloc_cmap(&info->cmap);
  err_exit_both:
+       kfree(info->pixmap.addr);
+ err_exit_pixmap:
        iounmap(info->screen_base);
        release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
  err_exit_mmio:
@@ -1142,12 +1480,18 @@ static void __devexit pm3fb_remove(struct pci_dev *dev)
                unregister_framebuffer(info);
                fb_dealloc_cmap(&info->cmap);
 
+#ifdef CONFIG_MTRR
+       if (par->mtrr_handle >= 0)
+               mtrr_del(par->mtrr_handle, info->fix.smem_start,
+                        info->fix.smem_len);
+#endif /* CONFIG_MTRR */
                iounmap(info->screen_base);
                release_mem_region(fix->smem_start, fix->smem_len);
                iounmap(par->v_regs);
                release_mem_region(fix->mmio_start, fix->mmio_len);
 
                pci_set_drvdata(dev, NULL);
+               kfree(info->pixmap.addr);
                framebuffer_release(info);
        }
 }
@@ -1168,21 +1512,78 @@ static struct pci_driver pm3fb_driver = {
 
 MODULE_DEVICE_TABLE(pci, pm3fb_id_table);
 
+#ifndef MODULE
+       /*
+        *  Setup
+        */
+
+/*
+ * Only necessary if your driver takes special options,
+ * otherwise we fall back on the generic fb_setup().
+ */
+static int __init pm3fb_setup(char *options)
+{
+       char *this_opt;
+
+       /* Parse user speficied options (`video=pm3fb:') */
+       if (!options || !*options)
+               return 0;
+
+       while ((this_opt = strsep(&options, ",")) != NULL) {
+               if (!*this_opt)
+                       continue;
+               else if (!strncmp(this_opt, "noaccel", 7))
+                       noaccel = 1;
+               else if (!strncmp(this_opt, "hwcursor=", 9))
+                       hwcursor = simple_strtoul(this_opt + 9, NULL, 0);
+#ifdef CONFIG_MTRR
+               else if (!strncmp(this_opt, "nomtrr", 6))
+                       nomtrr = 1;
+#endif
+               else
+                       mode_option = this_opt;
+       }
+       return 0;
+}
+#endif /* MODULE */
+
 static int __init pm3fb_init(void)
 {
+       /*
+        *  For kernel boot options (in 'video=pm3fb:<options>' format)
+        */
 #ifndef MODULE
-       if (fb_get_options("pm3fb", NULL))
+       char *option = NULL;
+
+       if (fb_get_options("pm3fb", &option))
                return -ENODEV;
+       pm3fb_setup(option);
 #endif
+
        return pci_register_driver(&pm3fb_driver);
 }
 
+#ifdef MODULE
 static void __exit pm3fb_exit(void)
 {
        pci_unregister_driver(&pm3fb_driver);
 }
 
-module_init(pm3fb_init);
 module_exit(pm3fb_exit);
+#endif
+module_init(pm3fb_init);
+
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param(noaccel, bool, 0);
+MODULE_PARM_DESC(noaccel, "Disable acceleration");
+module_param(hwcursor, int, 0644);
+MODULE_PARM_DESC(hwcursor, "Enable hardware cursor "
+                       "(1=enable, 0=disable, default=1)");
+#ifdef CONFIG_MTRR
+module_param(nomtrr, bool, 0);
+MODULE_PARM_DESC(nomtrr, "Disable MTRR support (0 or 1=disabled) (default=0)");
+#endif
 
+MODULE_DESCRIPTION("Permedia3 framebuffer device driver");
 MODULE_LICENSE("GPL");