Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86

[linux-2.6-omap-h63xx.git] / drivers / video / savage / savagefb_driver.c

diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index f0dfb35e3191b4637e76d085927f3e41dd76e5d0..ab727eaa7f43f3819ca45cff046a3bf057e28b0c 100644 (file)
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -686,7 +686,7 @@ static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode
 static int savagefb_check_var (struct fb_var_screeninfo   *var,
                               struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        int memlen, vramlen, mode_valid = 0;
 
        DBG("savagefb_check_var");
@@ -1025,7 +1025,7 @@ static int savagefb_setcolreg(unsigned        regno,
                              unsigned        transp,
                              struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
 
        if (regno >= NR_PALETTE)
                return -EINVAL;
@@ -1315,16 +1315,20 @@ static void savagefb_set_fix(struct fb_info *info)
        info->fix.line_length = info->var.xres_virtual *
                info->var.bits_per_pixel / 8;
 
-       if (info->var.bits_per_pixel == 8)
+       if (info->var.bits_per_pixel == 8) {
                info->fix.visual      = FB_VISUAL_PSEUDOCOLOR;
-       else
+               info->fix.xpanstep    = 4;
+       } else {
                info->fix.visual      = FB_VISUAL_TRUECOLOR;
+               info->fix.xpanstep    = 2;
+       }
+
 }
 
 #if defined(CONFIG_FB_SAVAGE_ACCEL)
 static void savagefb_set_clip(struct fb_info *info)
 {
-    struct savagefb_par *par = (struct savagefb_par *)info->par;
+    struct savagefb_par *par = info->par;
     int cmd;
 
     cmd = BCI_CMD_NOP | BCI_CMD_CLIP_NEW;
@@ -1338,7 +1342,7 @@ static void savagefb_set_clip(struct fb_info *info)
 
 static int savagefb_set_par (struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        struct fb_var_screeninfo *var = &info->var;
        int err;
 
@@ -1363,7 +1367,6 @@ static int savagefb_set_par (struct fb_info *info)
        par->minClock = 10000;
 
        savagefb_set_par_int (par);
-       savagefb_update_start (par, var);
        fb_set_cmap (&info->cmap, info);
        savagefb_set_fix(info);
        savagefb_set_clip(info);
@@ -1378,29 +1381,9 @@ static int savagefb_set_par (struct fb_info *info)
 static int savagefb_pan_display (struct fb_var_screeninfo *var,
                                 struct fb_info           *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
-       u_int y_bottom;
-
-       y_bottom = var->yoffset;
-
-       if (!(var->vmode & FB_VMODE_YWRAP))
-               y_bottom += var->yres;
-
-       if (var->xoffset > (var->xres_virtual - var->xres))
-               return -EINVAL;
-       if (y_bottom > info->var.yres_virtual)
-               return -EINVAL;
+       struct savagefb_par *par = info->par;
 
        savagefb_update_start (par, var);
-
-       info->var.xoffset = var->xoffset;
-       info->var.yoffset = var->yoffset;
-
-       if (var->vmode & FB_VMODE_YWRAP)
-               info->var.vmode |= FB_VMODE_YWRAP;
-       else
-               info->var.vmode &= ~FB_VMODE_YWRAP;
-
        return 0;
 }
 
@@ -1531,7 +1514,7 @@ static void savage_disable_mmio (struct savagefb_par *par)
 
 static int __devinit savage_map_mmio (struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        DBG ("savage_map_mmio");
 
        if (S3_SAVAGE3D_SERIES (par->chip))
@@ -1564,7 +1547,7 @@ static int __devinit savage_map_mmio (struct fb_info *info)
 
 static void __devinit savage_unmap_mmio (struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        DBG ("savage_unmap_mmio");
 
        savage_disable_mmio(par);
@@ -1578,7 +1561,7 @@ static void __devinit savage_unmap_mmio (struct fb_info *info)
 static int __devinit savage_map_video (struct fb_info *info,
                                       int video_len)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        int resource;
 
        DBG("savage_map_video");
@@ -1616,7 +1599,7 @@ static int __devinit savage_map_video (struct fb_info *info,
 
 static void __devinit savage_unmap_video (struct fb_info *info)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
 
        DBG("savage_unmap_video");
 
@@ -1866,14 +1849,13 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
                                          struct pci_dev *dev,
                                          const struct pci_device_id *id)
 {
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct savagefb_par *par = info->par;
        int err = 0;
 
        par->pcidev  = dev;
 
        info->fix.type     = FB_TYPE_PACKED_PIXELS;
        info->fix.type_aux         = 0;
-       info->fix.xpanstep         = 2;
        info->fix.ypanstep         = 1;
        info->fix.ywrapstep   = 0;
        info->fix.accel       = id->driver_data;
@@ -2137,8 +2119,7 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
 
 static void __devexit savagefb_remove (struct pci_dev *dev)
 {
-       struct fb_info *info =
-               (struct fb_info *)pci_get_drvdata(dev);
+       struct fb_info *info = pci_get_drvdata(dev);
 
        DBG("savagefb_remove");
 
@@ -2172,9 +2153,8 @@ static void __devexit savagefb_remove (struct pci_dev *dev)
 
 static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
 {
-       struct fb_info *info =
-               (struct fb_info *)pci_get_drvdata(dev);
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct fb_info *info = pci_get_drvdata(dev);
+       struct savagefb_par *par = info->par;
 
        DBG("savagefb_suspend");
 
@@ -2208,9 +2188,8 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
 
 static int savagefb_resume (struct pci_dev* dev)
 {
-       struct fb_info *info =
-               (struct fb_info *)pci_get_drvdata(dev);
-       struct savagefb_par *par = (struct savagefb_par *)info->par;
+       struct fb_info *info = pci_get_drvdata(dev);
+       struct savagefb_par *par = info->par;
        int cur_state = par->pm_state;
 
        DBG("savage_resume");