Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (207 commits)
  drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile
  drm/radeon: fix power supply kconfig interaction.
  drm/radeon/kms: record object that have been list reserved
  drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.
  drm/radeon/kms: don't default display priority to high on rs4xx
  drm/edid: fix typo in 1600x1200@75 mode
  drm/nouveau: fix i2c-related init table handlers
  drm/nouveau: support init table i2c device identifier 0x81
  drm/nouveau: ensure we've parsed i2c table entry for INIT_*I2C* handlers
  drm/nouveau: display error message for any failed init table opcode
  drm/nouveau: fix init table handlers to return proper error codes
  drm/nv50: support fractional feedback divider on newer chips
  drm/nv50: fix monitor detection on certain chipsets
  drm/nv50: store full dcb i2c entry from vbios
  drm/nv50: fix suspend/resume with DP outputs
  drm/nv50: output calculated crtc pll when debugging on
  drm/nouveau: dump pll limits entries when debugging is on
  drm/nouveau: bios parser fixes for eDP boards
  drm/nouveau: fix a nouveau_bo dereference after it's been destroyed
  drm/nv40: remove some completed ctxprog TODOs
  ...

6 files changed, 109 insertions, 42 deletions

diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index ecf405562f5c..4a56f46af40a 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -168,7 +168,7 @@ static void efifb_destroy(struct fb_info *info)
 {
         if (info->screen_base)
                 iounmap(info->screen_base);
-        release_mem_region(info->aperture_base, info->aperture_size);
+        release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
         framebuffer_release(info);
 }
 
@@ -292,8 +292,13 @@ static int __devinit efifb_probe(struct platform_device *dev)
         info->pseudo_palette = info->par;
         info->par = NULL;
 
-        info->aperture_base = efifb_fix.smem_start;
-        info->aperture_size = size_remap;
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures) {
+                err = -ENOMEM;
+                goto err_release_fb;
+        }
+        info->apertures->ranges[0].base = efifb_fix.smem_start;
+        info->apertures->ranges[0].size = size_remap;
 
         info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len);
         if (!info->screen_base) {
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index a15b44e9c003..e08b7b5cb326 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1468,16 +1468,67 @@ static int fb_check_foreignness(struct fb_info *fi)
         return 0;
 }
 
-static bool fb_do_apertures_overlap(struct fb_info *gen, struct fb_info *hw)
+static bool apertures_overlap(struct aperture *gen, struct aperture *hw)
 {
         /* is the generic aperture base the same as the HW one */
-        if (gen->aperture_base == hw->aperture_base)
+        if (gen->base == hw->base)
                 return true;
         /* is the generic aperture base inside the hw base->hw base+size */
-        if (gen->aperture_base > hw->aperture_base && gen->aperture_base <= hw->aperture_base + hw->aperture_size)
+        if (gen->base > hw->base && gen->base <= hw->base + hw->size)
                 return true;
         return false;
 }
+
+static bool fb_do_apertures_overlap(struct apertures_struct *gena,
+                                    struct apertures_struct *hwa)
+{
+        int i, j;
+        if (!hwa || !gena)
+                return false;
+
+        for (i = 0; i < hwa->count; ++i) {
+                struct aperture *h = &hwa->ranges[i];
+                for (j = 0; j < gena->count; ++j) {
+                        struct aperture *g = &gena->ranges[j];
+                        printk(KERN_DEBUG "checking generic (%llx %llx) vs hw (%llx %llx)\n",
+                                g->base, g->size, h->base, h->size);
+                        if (apertures_overlap(g, h))
+                                return true;
+                }
+        }
+
+        return false;
+}
+
+#define VGA_FB_PHYS 0xA0000
+void remove_conflicting_framebuffers(struct apertures_struct *a,
+                                     const char *name, bool primary)
+{
+        int i;
+
+        /* check all firmware fbs and kick off if the base addr overlaps */
+        for (i = 0 ; i < FB_MAX; i++) {
+                struct apertures_struct *gen_aper;
+                if (!registered_fb[i])
+                        continue;
+
+                if (!(registered_fb[i]->flags & FBINFO_MISC_FIRMWARE))
+                        continue;
+
+                gen_aper = registered_fb[i]->apertures;
+                if (fb_do_apertures_overlap(gen_aper, a) ||
+                        (primary && gen_aper && gen_aper->count &&
+                         gen_aper->ranges[0].base == VGA_FB_PHYS)) {
+
+                        printk(KERN_ERR "fb: conflicting fb hw usage "
+                               "%s vs %s - removing generic driver\n",
+                               name, registered_fb[i]->fix.id);
+                        unregister_framebuffer(registered_fb[i]);
+                }
+        }
+}
+EXPORT_SYMBOL(remove_conflicting_framebuffers);
+
 /**
  *      register_framebuffer - registers a frame buffer device
  *      @fb_info: frame buffer info structure
@@ -1501,21 +1552,8 @@ register_framebuffer(struct fb_info *fb_info)
         if (fb_check_foreignness(fb_info))
                 return -ENOSYS;
 
-        /* check all firmware fbs and kick off if the base addr overlaps */
-        for (i = 0 ; i < FB_MAX; i++) {
-                if (!registered_fb[i])
-                        continue;
-
-                if (registered_fb[i]->flags & FBINFO_MISC_FIRMWARE) {
-                        if (fb_do_apertures_overlap(registered_fb[i], fb_info)) {
-                                printk(KERN_ERR "fb: conflicting fb hw usage "
-                                       "%s vs %s - removing generic driver\n",
-                                       fb_info->fix.id,
-                                       registered_fb[i]->fix.id);
-                                unregister_framebuffer(registered_fb[i]);
-                        }
-                }
-        }
+        remove_conflicting_framebuffers(fb_info->apertures, fb_info->fix.id,
+                                         fb_is_primary_device(fb_info));
 
         num_registered_fb++;
         for (i = 0 ; i < FB_MAX; i++)
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 81aa3129c17d..0a08f1341227 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -80,6 +80,7 @@ EXPORT_SYMBOL(framebuffer_alloc);
  */
 void framebuffer_release(struct fb_info *info)
 {
+        kfree(info->apertures);
         kfree(info);
 }
 EXPORT_SYMBOL(framebuffer_release);
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 61f8b8f919b0..46dda7d8aaee 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -285,7 +285,7 @@ static void offb_destroy(struct fb_info *info)
 {
         if (info->screen_base)
                 iounmap(info->screen_base);
-        release_mem_region(info->aperture_base, info->aperture_size);
+        release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
         framebuffer_release(info);
 }
 
@@ -491,8 +491,11 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         var->vmode = FB_VMODE_NONINTERLACED;
 
         /* set offb aperture size for generic probing */
-        info->aperture_base = address;
-        info->aperture_size = fix->smem_len;
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures)
+                goto out_aper;
+        info->apertures->ranges[0].base = address;
+        info->apertures->ranges[0].size = fix->smem_len;
 
         info->fbops = &offb_ops;
         info->screen_base = ioremap(address, fix->smem_len);
@@ -501,17 +504,20 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         fb_alloc_cmap(&info->cmap, 256, 0);
 
-        if (register_framebuffer(info) < 0) {
-                iounmap(par->cmap_adr);
-                par->cmap_adr = NULL;
-                iounmap(info->screen_base);
-                framebuffer_release(info);
-                release_mem_region(res_start, res_size);
-                return;
-        }
+        if (register_framebuffer(info) < 0)
+                goto out_err;
 
         printk(KERN_INFO "fb%d: Open Firmware frame buffer device on %s\n",
                info->node, full_name);
+        return;
+
+out_err:
+        iounmap(info->screen_base);
+out_aper:
+        iounmap(par->cmap_adr);
+        par->cmap_adr = NULL;
+        framebuffer_release(info);
+        release_mem_region(res_start, res_size);
 }
 
 
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 0cadf7aee27e..090aa1a9be6e 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -177,7 +177,7 @@ static void vesafb_destroy(struct fb_info *info)
 {
         if (info->screen_base)
                 iounmap(info->screen_base);
-        release_mem_region(info->aperture_base, info->aperture_size);
+        release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
         framebuffer_release(info);
 }
 
@@ -295,8 +295,13 @@ static int __init vesafb_probe(struct platform_device *dev)
         info->par = NULL;
 
         /* set vesafb aperture size for generic probing */
-        info->aperture_base = screen_info.lfb_base;
-        info->aperture_size = size_total;
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures) {
+                err = -ENOMEM;
+                goto err;
+        }
+        info->apertures->ranges[0].base = screen_info.lfb_base;
+        info->apertures->ranges[0].size = size_total;
 
         info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
         if (!info->screen_base) {
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index bf638a47a5b3..149c47ac7e93 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1263,10 +1263,19 @@ static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image
                 vga_imageblit_color(info, image);
 }
 
+static void vga16fb_destroy(struct fb_info *info)
+{
+        iounmap(info->screen_base);
+        fb_dealloc_cmap(&info->cmap);
+        /* XXX unshare VGA regions */
+        framebuffer_release(info);
+}
+
 static struct fb_ops vga16fb_ops = {
         .owner          = THIS_MODULE,
         .fb_open        = vga16fb_open,
         .fb_release     = vga16fb_release,
+        .fb_destroy     = vga16fb_destroy,
         .fb_check_var   = vga16fb_check_var,
         .fb_set_par     = vga16fb_set_par,
         .fb_setcolreg   = vga16fb_setcolreg,
@@ -1306,6 +1315,11 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
                 ret = -ENOMEM;
                 goto err_fb_alloc;
         }
+        info->apertures = alloc_apertures(1);
+        if (!info->apertures) {
+                ret = -ENOMEM;
+                goto err_ioremap;
+        }
 
         /* XXX share VGA_FB_PHYS and I/O region with vgacon and others */
         info->screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS, 0);
@@ -1335,7 +1349,7 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
         info->fix = vga16fb_fix;
         /* supports rectangles with widths of multiples of 8 */
         info->pixmap.blit_x = 1 << 7 | 1 << 15 | 1 << 23 | 1 << 31;
-        info->flags = FBINFO_FLAG_DEFAULT |
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
                 FBINFO_HWACCEL_YPAN;
 
         i = (info->var.bits_per_pixel == 8) ? 256 : 16;
@@ -1354,6 +1368,9 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
 
         vga16fb_update_fix(info);
 
+        info->apertures->ranges[0].base = VGA_FB_PHYS;
+        info->apertures->ranges[0].size = VGA_FB_PHYS_LEN;
+
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR "vga16fb: unable to register framebuffer\n");
                 ret = -EINVAL;
@@ -1380,13 +1397,8 @@ static int vga16fb_remove(struct platform_device *dev)
 {
         struct fb_info *info = platform_get_drvdata(dev);
 
-        if (info) {
+        if (info)
                 unregister_framebuffer(info);
-                iounmap(info->screen_base);
-                fb_dealloc_cmap(&info->cmap);
-        /* XXX unshare VGA regions */
-                framebuffer_release(info);
-        }
 
         return 0;
 }