Merge branch 'fixes' into for-linus

Conflicts:

	arch/arm/mach-versatile/core.c

12 files changed, 102 insertions, 70 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d85a74c64b54..f79c2040758b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -673,7 +673,6 @@ config FB_VESA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select VIDEO_SELECT
         help
           This is the frame buffer device driver for generic VESA 2.0
           compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -1578,7 +1577,6 @@ config FB_CYBLA
         tristate "Cyberblade/i1 support"
         depends on FB && PCI && X86_32 && !64BIT
         select FB_CFB_IMAGEBLIT
-        select VIDEO_SELECT
         ---help---
           This driver is supposed to support the Trident Cyberblade/i1
           graphics core integrated in the VIA VT8601A North Bridge,
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
index 385cba40ea87..06964af761c6 100644
--- a/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@ -111,6 +111,4 @@ module_exit(mbp_exit);
 MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
 MODULE_DESCRIPTION("Nvidia-based Macbook Pro Backlight Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,1");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,2");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro4,1");
+MODULE_DEVICE_TABLE(dmi, mbp_device_table);
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index e721644bad74..1e35ba6f18e0 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -372,7 +372,7 @@ static int __devexit bw2_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id bw2_match[] = {
+static const struct of_device_id bw2_match[] = {
         {
                 .name = "bwtwo",
         },
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index b17e74671779..a2d1882791a5 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -589,7 +589,7 @@ static int __devexit cg14_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg14_match[] = {
+static const struct of_device_id cg14_match[] = {
         {
                 .name = "cgfourteen",
         },
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 3aa7b6cb0268..99f87fb61d05 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -456,7 +456,7 @@ static int __devexit cg3_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg3_match[] = {
+static const struct of_device_id cg3_match[] = {
         {
                 .name = "cgthree",
         },
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 2f64bb3bd254..940ec04f0f1b 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -34,10 +34,11 @@ static int cg6_blank(int, struct fb_info *);
 
 static void cg6_imageblit(struct fb_info *, const struct fb_image *);
 static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *);
+static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 static int cg6_sync(struct fb_info *);
 static int cg6_mmap(struct fb_info *, struct vm_area_struct *);
 static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long);
-static void cg6_copyarea(struct fb_info *info, const struct fb_copyarea *area);
+static int cg6_pan_display(struct fb_var_screeninfo *, struct fb_info *);
 
 /*
  *  Frame buffer operations
@@ -47,6 +48,7 @@ static struct fb_ops cg6_ops = {
         .owner                  = THIS_MODULE,
         .fb_setcolreg           = cg6_setcolreg,
         .fb_blank               = cg6_blank,
+        .fb_pan_display         = cg6_pan_display,
         .fb_fillrect            = cg6_fillrect,
         .fb_copyarea            = cg6_copyarea,
         .fb_imageblit           = cg6_imageblit,
@@ -161,6 +163,7 @@ static struct fb_ops cg6_ops = {
 #define CG6_THC_MISC_INT_ENAB           (1 << 5)
 #define CG6_THC_MISC_INT                (1 << 4)
 #define CG6_THC_MISC_INIT               0x9f
+#define CG6_THC_CURSOFF                 ((65536-32) | ((65536-32) << 16))
 
 /* The contents are unknown */
 struct cg6_tec {
@@ -280,6 +283,33 @@ static int cg6_sync(struct fb_info *info)
         return 0;
 }
 
+static void cg6_switch_from_graph(struct cg6_par *par)
+{
+        struct cg6_thc __iomem *thc = par->thc;
+        unsigned long flags;
+
+        spin_lock_irqsave(&par->lock, flags);
+
+        /* Hide the cursor. */
+        sbus_writel(CG6_THC_CURSOFF, &thc->thc_cursxy);
+
+        spin_unlock_irqrestore(&par->lock, flags);
+}
+
+static int cg6_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct cg6_par *par = (struct cg6_par *)info->par;
+
+        /* We just use this to catch switches out of
+         * graphics mode.
+         */
+        cg6_switch_from_graph(par);
+
+        if (var->xoffset || var->yoffset || var->vmode)
+                return -EINVAL;
+        return 0;
+}
+
 /**
  *      cg6_fillrect -  Draws a rectangle on the screen.
  *
@@ -643,9 +673,13 @@ static void __devinit cg6_chip_init(struct fb_info *info)
         struct cg6_par *par = (struct cg6_par *)info->par;
         struct cg6_tec __iomem *tec = par->tec;
         struct cg6_fbc __iomem *fbc = par->fbc;
+        struct cg6_thc __iomem *thc = par->thc;
         u32 rev, conf, mode;
         int i;
 
+        /* Hide the cursor. */
+        sbus_writel(CG6_THC_CURSOFF, &thc->thc_cursxy);
+
         /* Turn off stuff in the Transform Engine. */
         sbus_writel(0, &tec->tec_matrix);
         sbus_writel(0, &tec->tec_clip);
@@ -814,7 +848,7 @@ static int __devexit cg6_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id cg6_match[] = {
+static const struct of_device_id cg6_match[] = {
         {
                 .name = "cgsix",
         },
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 06f87b04f207..2f50a80b413e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE
          buffer.  Each 64KB will give you approximately 16 80x25
          screenfuls of scrollback buffer
 
-config VIDEO_SELECT
-        bool "Video mode selection support"
-        depends on  X86 && VGA_CONSOLE
-        ---help---
-          This enables support for text mode selection on kernel startup. If
-          you want to take advantage of some high-resolution text mode your
-          card's BIOS offers, but the traditional Linux utilities like
-          SVGATextMode don't, you can say Y here and set the mode using the
-          "vga=" option from your boot loader (lilo or loadlin) or set
-          "vga=ask" which brings up a video mode menu on kernel startup. (Try
-          "man bootparam" or see the documentation of your boot loader about
-          how to pass options to the kernel.)
-
-          Read the file <file:Documentation/svga.txt> for more information
-          about the Video mode selection support. If unsure, say N.
-
 config MDA_CONSOLE
         depends on !M68K && !PARISC && ISA
         tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 7992b13ee68f..9dbb9646081f 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1042,7 +1042,7 @@ static int __devexit ffb_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id ffb_match[] = {
+static const struct of_device_id ffb_match[] = {
         {
                 .name = "SUNW,ffb",
         },
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 13fea61d6ae4..7c7e8c2da9d9 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -33,6 +33,7 @@ static int leo_blank(int, struct fb_info *);
 
 static int leo_mmap(struct fb_info *, struct vm_area_struct *);
 static int leo_ioctl(struct fb_info *, unsigned int, unsigned long);
+static int leo_pan_display(struct fb_var_screeninfo *, struct fb_info *);
 
 /*
  *  Frame buffer operations
@@ -42,6 +43,7 @@ static struct fb_ops leo_ops = {
         .owner                  = THIS_MODULE,
         .fb_setcolreg           = leo_setcolreg,
         .fb_blank               = leo_blank,
+        .fb_pan_display         = leo_pan_display,
         .fb_fillrect            = cfb_fillrect,
         .fb_copyarea            = cfb_copyarea,
         .fb_imageblit           = cfb_imageblit,
@@ -206,6 +208,60 @@ static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
         return;
 }
 
+static void leo_switch_from_graph(struct fb_info *info)
+{
+        struct leo_par *par = (struct leo_par *) info->par;
+        struct leo_ld_ss0 __iomem *ss = par->ld_ss0;
+        struct leo_cursor __iomem *cursor = par->cursor;
+        unsigned long flags;
+        u32 val;
+
+        spin_lock_irqsave(&par->lock, flags);
+
+        par->extent = ((info->var.xres - 1) |
+                       ((info->var.yres - 1) << 16));
+
+        sbus_writel(0xffffffff, &ss->wid);
+        sbus_writel(0xffff, &ss->wmask);
+        sbus_writel(0, &ss->vclipmin);
+        sbus_writel(par->extent, &ss->vclipmax);
+        sbus_writel(0, &ss->fg);
+        sbus_writel(0xff000000, &ss->planemask);
+        sbus_writel(0x310850, &ss->rop);
+        sbus_writel(0, &ss->widclip);
+        sbus_writel((info->var.xres-1) | ((info->var.yres-1) << 11),
+                    &par->lc_ss0_usr->extent);
+        sbus_writel(4, &par->lc_ss0_usr->addrspace);
+        sbus_writel(0x80000000, &par->lc_ss0_usr->fill);
+        sbus_writel(0, &par->lc_ss0_usr->fontt);
+        do {
+                val = sbus_readl(&par->lc_ss0_usr->csr);
+        } while (val & 0x20000000);
+
+        /* setup screen buffer for cfb_* functions */
+        sbus_writel(1, &ss->wid);
+        sbus_writel(0x00ffffff, &ss->planemask);
+        sbus_writel(0x310b90, &ss->rop);
+        sbus_writel(0, &par->lc_ss0_usr->addrspace);
+
+        /* hide cursor */
+        sbus_writel(sbus_readl(&cursor->cur_misc) & ~LEO_CUR_ENABLE, &cursor->cur_misc);
+
+        spin_unlock_irqrestore(&par->lock, flags);
+}
+
+static int leo_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        /* We just use this to catch switches out of
+         * graphics mode.
+         */
+        leo_switch_from_graph(info);
+
+        if (var->xoffset || var->yoffset || var->vmode)
+                return -EINVAL;
+        return 0;
+}
+
 /**
  *      leo_setcolreg - Optional function. Sets a color register.
  *      @regno: boolean, 0 copy local, 1 get_user() function
@@ -454,44 +510,6 @@ static void leo_init_wids(struct fb_info *info)
         leo_wid_put(info, &wl);
 }
 
-static void leo_switch_from_graph(struct fb_info *info)
-{
-        struct leo_par *par = (struct leo_par *) info->par;
-        struct leo_ld_ss0 __iomem *ss = par->ld_ss0;
-        unsigned long flags;
-        u32 val;
-
-        spin_lock_irqsave(&par->lock, flags);
-
-        par->extent = ((info->var.xres - 1) |
-                       ((info->var.yres - 1) << 16));
-
-        sbus_writel(0xffffffff, &ss->wid);
-        sbus_writel(0xffff, &ss->wmask);
-        sbus_writel(0, &ss->vclipmin);
-        sbus_writel(par->extent, &ss->vclipmax);
-        sbus_writel(0, &ss->fg);
-        sbus_writel(0xff000000, &ss->planemask);
-        sbus_writel(0x310850, &ss->rop);
-        sbus_writel(0, &ss->widclip);
-        sbus_writel((info->var.xres-1) | ((info->var.yres-1) << 11),
-                    &par->lc_ss0_usr->extent);
-        sbus_writel(4, &par->lc_ss0_usr->addrspace);
-        sbus_writel(0x80000000, &par->lc_ss0_usr->fill);
-        sbus_writel(0, &par->lc_ss0_usr->fontt);
-        do {
-                val = sbus_readl(&par->lc_ss0_usr->csr);
-        } while (val & 0x20000000);
-
-        /* setup screen buffer for cfb_* functions */
-        sbus_writel(1, &ss->wid);
-        sbus_writel(0x00ffffff, &ss->planemask);
-        sbus_writel(0x310b90, &ss->rop);
-        sbus_writel(0, &par->lc_ss0_usr->addrspace);
-
-        spin_unlock_irqrestore(&par->lock, flags);
-}
-
 static void leo_init_hw(struct fb_info *info)
 {
         struct leo_par *par = (struct leo_par *) info->par;
@@ -641,7 +659,7 @@ static int __devexit leo_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id leo_match[] = {
+static const struct of_device_id leo_match[] = {
         {
                 .name = "SUNW,leo",
         },
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 9e903454ffc1..7000f2cd5854 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -349,7 +349,7 @@ static int __devexit p9100_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id p9100_match[] = {
+static const struct of_device_id p9100_match[] = {
         {
                 .name = "p9100",
         },
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 2a03f78bbb0d..643afbfe8277 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -505,7 +505,7 @@ static int __devexit tcx_remove(struct of_device *op)
         return 0;
 }
 
-static struct of_device_id tcx_match[] = {
+static const struct of_device_id tcx_match[] = {
         {
                 .name = "SUNW,tcx",
         },
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 47ed39b52f9c..a463b3dd837b 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -680,11 +680,11 @@ static struct xenbus_driver xenfb = {
 
 static int __init xenfb_init(void)
 {
-        if (!is_running_on_xen())
+        if (!xen_domain())
                 return -ENODEV;
 
         /* Nothing to do if running in dom0. */
-        if (is_initial_xendomain())
+        if (xen_initial_domain())
                 return -ENODEV;
 
         return xenbus_register_frontend(&xenfb);