Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / tdfxfb.c

diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 7044226..5e5328d 100644 (file)
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -184,7 +184,6 @@ static struct fb_ops tdfxfb_ops = {
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
 #endif
-       .fb_cursor      = soft_cursor,
 };
 
 /*
@@ -292,7 +291,7 @@ static inline void banshee_make_room(struct tdfx_par *par, int size)
  
 static int banshee_wait_idle(struct fb_info *info)
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par; 
+       struct tdfx_par *par = info->par;
        int i = 0;
 
        banshee_make_room(par, 1);
@@ -365,7 +364,7 @@ static u32 do_calc_pll(int freq, int* freq_out)
 
 static void do_write_regs(struct fb_info *info, struct banshee_reg* reg) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par; 
+       struct tdfx_par *par = info->par;
        int i;
 
        banshee_wait_idle(info);
@@ -470,7 +469,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
 
 static int tdfxfb_check_var(struct fb_var_screeninfo *var,struct fb_info *info) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par; 
+       struct tdfx_par *par = info->par;
        u32 lpitch;
 
        if (var->bits_per_pixel != 8  && var->bits_per_pixel != 16 &&
@@ -559,7 +558,7 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var,struct fb_info *info)
 
 static int tdfxfb_set_par(struct fb_info *info)
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;   
+       struct tdfx_par *par = info->par;
        u32 hdispend, hsyncsta, hsyncend, htotal;
        u32 hd, hs, he, ht, hbs, hbe;
        u32 vd, vs, ve, vt, vbs, vbe;
@@ -781,37 +780,45 @@ static int tdfxfb_set_par(struct fb_info *info)
 static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green,  
                            unsigned blue,unsigned transp,struct fb_info *info) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        u32 rgbcol;
    
        if (regno >= info->cmap.len || regno > 255) return 1;
    
        switch (info->fix.visual) {
-               case FB_VISUAL_PSEUDOCOLOR:
-                       rgbcol =(((u32)red   & 0xff00) << 8) |
-                               (((u32)green & 0xff00) << 0) |
-                               (((u32)blue  & 0xff00) >> 8);
-                       do_setpalentry(par, regno, rgbcol);
-                       break;
-               /* Truecolor has no hardware color palettes. */
-               case FB_VISUAL_TRUECOLOR:
-                       rgbcol = (CNVT_TOHW( red, info->var.red.length) << info->var.red.offset) |
-                                (CNVT_TOHW( green, info->var.green.length) << info->var.green.offset) |
-                                (CNVT_TOHW( blue, info->var.blue.length) << info->var.blue.offset) |
-                                (CNVT_TOHW( transp, info->var.transp.length) << info->var.transp.offset);
-                               ((u32*)(info->pseudo_palette))[regno] = rgbcol;
-                       break;
-               default:
-                       DPRINTK("bad depth %u\n", info->var.bits_per_pixel);
-                       break;
+       case FB_VISUAL_PSEUDOCOLOR:
+               rgbcol =(((u32)red   & 0xff00) << 8) |
+                       (((u32)green & 0xff00) << 0) |
+                       (((u32)blue  & 0xff00) >> 8);
+               do_setpalentry(par, regno, rgbcol);
+               break;
+       /* Truecolor has no hardware color palettes. */
+       case FB_VISUAL_TRUECOLOR:
+               if (regno < 16) {
+                       rgbcol = (CNVT_TOHW( red, info->var.red.length) <<
+                                 info->var.red.offset) |
+                               (CNVT_TOHW( green, info->var.green.length) <<
+                                info->var.green.offset) |
+                               (CNVT_TOHW( blue, info->var.blue.length) <<
+                                info->var.blue.offset) |
+                               (CNVT_TOHW( transp, info->var.transp.length) <<
+                                info->var.transp.offset);
+                       par->palette[regno] = rgbcol;
+               }
+
+               break;
+       default:
+               DPRINTK("bad depth %u\n", info->var.bits_per_pixel);
+               break;
        }
+
        return 0;
 }
 
 /* 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off */
 static int tdfxfb_blank(int blank, struct fb_info *info)
 { 
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        u32 dacmode, state = 0, vgablank = 0;
 
        dacmode = tdfx_inl(par, DACMODE);
@@ -856,7 +863,7 @@ static int tdfxfb_blank(int blank, struct fb_info *info)
 static int tdfxfb_pan_display(struct fb_var_screeninfo *var,
                              struct fb_info *info) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        u32 addr;       
 
        if (nopan || var->xoffset || (var->yoffset > var->yres_virtual))
@@ -879,7 +886,7 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var,
  */
 static void tdfxfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        u32 bpp = info->var.bits_per_pixel;
        u32 stride = info->fix.line_length;
        u32 fmt= stride | ((bpp+((bpp==8) ? 0 : 8)) << 13); 
@@ -895,7 +902,7 @@ static void tdfxfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect
        if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
                tdfx_outl(par,  COLORFORE, rect->color);
        } else { /* FB_VISUAL_TRUECOLOR */
-               tdfx_outl(par, COLORFORE, ((u32*)(info->pseudo_palette))[rect->color]);
+               tdfx_outl(par, COLORFORE, par->palette[rect->color]);
        }
        tdfx_outl(par,  COMMAND_2D, COMMAND_2D_FILLRECT | (tdfx_rop << 24));
        tdfx_outl(par,  DSTSIZE,    rect->width | (rect->height << 16));
@@ -907,7 +914,7 @@ static void tdfxfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect
  */
 static void tdfxfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)  
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        u32 sx = area->sx, sy = area->sy, dx = area->dx, dy = area->dy;
        u32 bpp = info->var.bits_per_pixel;
        u32 stride = info->fix.line_length;
@@ -939,7 +946,7 @@ static void tdfxfb_copyarea(struct fb_info *info, const struct fb_copyarea *area
 
 static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) 
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        int size = image->height * ((image->width * image->depth + 7)>>3);
        int fifo_free;
        int i, stride = info->fix.line_length;
@@ -962,8 +969,10 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
                                break;
                        case FB_VISUAL_TRUECOLOR:
                        default:
-                               tdfx_outl(par, COLORFORE, ((u32*)(info->pseudo_palette))[image->fg_color]);
-                               tdfx_outl(par, COLORBACK, ((u32*)(info->pseudo_palette))[image->bg_color]);
+                               tdfx_outl(par, COLORFORE,
+                                         par->palette[image->fg_color]);
+                               tdfx_outl(par, COLORBACK,
+                                         par->palette[image->bg_color]);
                }
 #ifdef __BIG_ENDIAN
                srcfmt = 0x400000 | BIT(20);
@@ -1008,7 +1017,7 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
 #ifdef TDFX_HARDWARE_CURSOR
 static int tdfxfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
        unsigned long flags;
 
        /*
@@ -1158,18 +1167,17 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 {
        struct tdfx_par *default_par;
        struct fb_info *info;
-       int size, err, lpitch;
+       int err, lpitch;
 
        if ((err = pci_enable_device(pdev))) {
                printk(KERN_WARNING "tdfxfb: Can't enable pdev: %d\n", err);
                return err;
        }
 
-       size = sizeof(struct tdfx_par)+256*sizeof(u32);
-
-       info = framebuffer_alloc(size, &pdev->dev);
+       info = framebuffer_alloc(sizeof(struct tdfx_par), &pdev->dev);
 
-       if (!info)      return -ENOMEM;
+       if (!info)
+               return -ENOMEM;
                
        default_par = info->par;
  
@@ -1249,7 +1257,7 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
    
        info->fbops             = &tdfxfb_ops;
        info->fix               = tdfx_fix;     
-       info->pseudo_palette    = (void *)(default_par + 1); 
+       info->pseudo_palette    = default_par->palette;
        info->flags             = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 #ifdef CONFIG_FB_3DFX_ACCEL
        info->flags             |= FBINFO_HWACCEL_FILLRECT |
@@ -1308,7 +1316,7 @@ out_err:
 }
 
 #ifndef MODULE
-void tdfxfb_setup(char *options)
+static void tdfxfb_setup(char *options)
 {
        char* this_opt;
 
@@ -1341,7 +1349,7 @@ void tdfxfb_setup(char *options)
 static void __devexit tdfxfb_remove(struct pci_dev *pdev)
 {
        struct fb_info *info = pci_get_drvdata(pdev);
-       struct tdfx_par *par = (struct tdfx_par *) info->par;
+       struct tdfx_par *par = info->par;
 
        unregister_framebuffer(info);
        iounmap(par->regbase_virt);