1 files changed, 137 insertions, 67 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index bc225e46fdd2..ca585ef37f25 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -31,7 +31,6 @@
 #include <linux/omapfb.h>
 
 #include <video/omapdss.h>
-#include <plat/vram.h>
 #include <video/omapvrfb.h>
 
 #include "omapfb.h"
@@ -1258,11 +1257,10 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
 
         switch (blank) {
         case FB_BLANK_UNBLANK:
-                if (display->state != OMAP_DSS_DISPLAY_SUSPENDED)
+                if (display->state == OMAP_DSS_DISPLAY_ACTIVE)
                         goto exit;
 
-                if (display->driver->resume)
-                        r = display->driver->resume(display);
+                r = display->driver->enable(display);
 
                 if ((display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) &&
                                 d->update_mode == OMAPFB_AUTO_UPDATE &&
@@ -1283,8 +1281,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
                 if (d->auto_update_work_enabled)
                         omapfb_stop_auto_update(fbdev, display);
 
-                if (display->driver->suspend)
-                        r = display->driver->suspend(display);
+                display->driver->disable(display);
 
                 break;
 
@@ -1335,24 +1332,25 @@ static void omapfb_free_fbmem(struct fb_info *fbi)
 
         rg = ofbi->region;
 
-        WARN_ON(atomic_read(&rg->map_count));
-
-        if (rg->paddr)
-                if (omap_vram_free(rg->paddr, rg->size))
-                        dev_err(fbdev->dev, "VRAM FREE failed\n");
+        if (rg->token == NULL)
+                return;
 
-        if (rg->vaddr)
-                iounmap(rg->vaddr);
+        WARN_ON(atomic_read(&rg->map_count));
 
         if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
                 /* unmap the 0 angle rotation */
                 if (rg->vrfb.vaddr[0]) {
                         iounmap(rg->vrfb.vaddr[0]);
-                        omap_vrfb_release_ctx(&rg->vrfb);
                         rg->vrfb.vaddr[0] = NULL;
                 }
+
+                omap_vrfb_release_ctx(&rg->vrfb);
         }
 
+        dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle,
+                        &rg->attrs);
+
+        rg->token = NULL;
         rg->vaddr = NULL;
         rg->paddr = 0;
         rg->alloc = 0;
@@ -1387,7 +1385,9 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
         struct omapfb_info *ofbi = FB2OFB(fbi);
         struct omapfb2_device *fbdev = ofbi->fbdev;
         struct omapfb2_mem_region *rg;
-        void __iomem *vaddr;
+        void *token;
+        DEFINE_DMA_ATTRS(attrs);
+        dma_addr_t dma_handle;
         int r;
 
         rg = ofbi->region;
@@ -1402,42 +1402,40 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
 
         size = PAGE_ALIGN(size);
 
-        if (!paddr) {
-                DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
-                r = omap_vram_alloc(size, &paddr);
-        } else {
-                DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
-                                ofbi->id);
-                r = omap_vram_reserve(paddr, size);
-        }
+        dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
 
-        if (r) {
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+                dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs);
+
+        DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
+
+        token = dma_alloc_attrs(fbdev->dev, size, &dma_handle,
+                        GFP_KERNEL, &attrs);
+
+        if (token == NULL) {
                 dev_err(fbdev->dev, "failed to allocate framebuffer\n");
                 return -ENOMEM;
         }
 
-        if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
-                vaddr = ioremap_wc(paddr, size);
-
-                if (!vaddr) {
-                        dev_err(fbdev->dev, "failed to ioremap framebuffer\n");
-                        omap_vram_free(paddr, size);
-                        return -ENOMEM;
-                }
+        DBG("allocated VRAM paddr %lx, vaddr %p\n",
+                        (unsigned long)dma_handle, token);
 
-                DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
-        } else {
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
                 r = omap_vrfb_request_ctx(&rg->vrfb);
                 if (r) {
+                        dma_free_attrs(fbdev->dev, size, token, dma_handle,
+                                        &attrs);
                         dev_err(fbdev->dev, "vrfb create ctx failed\n");
                         return r;
                 }
-
-                vaddr = NULL;
         }
 
-        rg->paddr = paddr;
-        rg->vaddr = vaddr;
+        rg->attrs = attrs;
+        rg->token = token;
+        rg->dma_handle = dma_handle;
+
+        rg->paddr = (unsigned long)dma_handle;
+        rg->vaddr = (void __iomem *)token;
         rg->size = size;
         rg->alloc = 1;
 
@@ -1531,6 +1529,9 @@ static int omapfb_parse_vram_param(const char *param, int max_entries,
 
                 }
 
+                WARN_ONCE(paddr,
+                        "reserving memory at predefined address not supported\n");
+
                 paddrs[fbnum] = paddr;
                 sizes[fbnum] = size;
 
@@ -1610,7 +1611,6 @@ int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
 {
         struct omapfb_info *ofbi = FB2OFB(fbi);
         struct omapfb2_device *fbdev = ofbi->fbdev;
-        struct omap_dss_device *display = fb2display(fbi);
         struct omapfb2_mem_region *rg = ofbi->region;
         unsigned long old_size = rg->size;
         unsigned long old_paddr = rg->paddr;
@@ -1625,9 +1625,6 @@ int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
         if (old_size == size && old_type == type)
                 return 0;
 
-        if (display && display->driver->sync)
-                        display->driver->sync(display);
-
         omapfb_free_fbmem(fbi);
 
         if (size == 0) {
@@ -1882,7 +1879,6 @@ static void omapfb_free_resources(struct omapfb2_device *fbdev)
         }
 
         dev_set_drvdata(fbdev->dev, NULL);
-        kfree(fbdev);
 }
 
 static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
@@ -2258,26 +2254,28 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
 {
         struct fb_monspecs *specs;
         u8 *edid;
-        int r, i, best_xres, best_idx, len;
+        int r, i, best_idx, len;
 
         if (!display->driver->read_edid)
                 return -ENODEV;
 
         len = 0x80 * 2;
         edid = kmalloc(len, GFP_KERNEL);
+        if (edid == NULL)
+                return -ENOMEM;
 
         r = display->driver->read_edid(display, edid, len);
         if (r < 0)
                 goto err1;
 
         specs = kzalloc(sizeof(*specs), GFP_KERNEL);
+        if (specs == NULL) {
+                r = -ENOMEM;
+                goto err1;
+        }
 
         fb_edid_to_monspecs(edid, specs);
 
-        if (edid[126] > 0)
-                fb_edid_add_monspecs(edid + 0x80, specs);
-
-        best_xres = 0;
         best_idx = -1;
 
         for (i = 0; i < specs->modedb_len; ++i) {
@@ -2293,16 +2291,20 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
                 if (m->xres == 2880 || m->xres == 1440)
                         continue;
 
+                if (m->vmode & FB_VMODE_INTERLACED ||
+                                m->vmode & FB_VMODE_DOUBLE)
+                        continue;
+
                 fb_videomode_to_omap_timings(m, display, &t);
 
                 r = display->driver->check_timings(display, &t);
-                if (r == 0 && best_xres < m->xres) {
-                        best_xres = m->xres;
+                if (r == 0) {
                         best_idx = i;
+                        break;
                 }
         }
 
-        if (best_xres == 0) {
+        if (best_idx == -1) {
                 r = -ENOENT;
                 goto err2;
         }
@@ -2371,15 +2373,62 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
         return 0;
 }
 
+static int omapfb_init_connections(struct omapfb2_device *fbdev,
+                struct omap_dss_device *def_dssdev)
+{
+        int i, r;
+        struct omap_overlay_manager *mgr;
+
+        if (!def_dssdev->output) {
+                dev_err(fbdev->dev, "no output for the default display\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < fbdev->num_displays; ++i) {
+                struct omap_dss_device *dssdev = fbdev->displays[i].dssdev;
+                struct omap_dss_output *out = dssdev->output;
+
+                mgr = omap_dss_get_overlay_manager(dssdev->channel);
+
+                if (!mgr || !out)
+                        continue;
+
+                if (mgr->output)
+                        mgr->unset_output(mgr);
+
+                mgr->set_output(mgr, out);
+        }
+
+        mgr = def_dssdev->output->manager;
+
+        if (!mgr) {
+                dev_err(fbdev->dev, "no ovl manager for the default display\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < fbdev->num_overlays; i++) {
+                struct omap_overlay *ovl = fbdev->overlays[i];
+
+                if (ovl->manager)
+                        ovl->unset_manager(ovl);
+
+                r = ovl->set_manager(ovl, mgr);
+                if (r)
+                        dev_warn(fbdev->dev,
+                                        "failed to connect overlay %s to manager %s\n",
+                                        ovl->name, mgr->name);
+        }
+
+        return 0;
+}
+
 static int __init omapfb_probe(struct platform_device *pdev)
 {
         struct omapfb2_device *fbdev = NULL;
         int r = 0;
         int i;
-        struct omap_overlay *ovl;
         struct omap_dss_device *def_display;
         struct omap_dss_device *dssdev;
-        struct omap_dss_device *ovl_device;
 
         DBG("omapfb_probe\n");
 
@@ -2389,7 +2438,8 @@ static int __init omapfb_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        fbdev = kzalloc(sizeof(struct omapfb2_device), GFP_KERNEL);
+        fbdev = devm_kzalloc(&pdev->dev, sizeof(struct omapfb2_device),
+                        GFP_KERNEL);
         if (fbdev == NULL) {
                 r = -ENOMEM;
                 goto err0;
@@ -2401,13 +2451,15 @@ static int __init omapfb_probe(struct platform_device *pdev)
                                 "ignoring the module parameter vrfb=y\n");
         }
 
+        r = omapdss_compat_init();
+        if (r)
+                goto err0;
 
         mutex_init(&fbdev->mtx);
 
         fbdev->dev = &pdev->dev;
         platform_set_drvdata(pdev, fbdev);
 
-        r = 0;
         fbdev->num_displays = 0;
         dssdev = NULL;
         for_each_dss_dev(dssdev) {
@@ -2430,9 +2482,6 @@ static int __init omapfb_probe(struct platform_device *pdev)
                         d->update_mode = OMAPFB_AUTO_UPDATE;
         }
 
-        if (r)
-                goto cleanup;
-
         if (fbdev->num_displays == 0) {
                 dev_err(&pdev->dev, "no displays\n");
                 r = -EINVAL;
@@ -2447,15 +2496,33 @@ static int __init omapfb_probe(struct platform_device *pdev)
         for (i = 0; i < fbdev->num_managers; i++)
                 fbdev->managers[i] = omap_dss_get_overlay_manager(i);
 
-        /* gfx overlay should be the default one. find a display
-         * connected to that, and use it as default display */
-        ovl = omap_dss_get_overlay(0);
-        ovl_device = ovl->get_device(ovl);
-        if (ovl_device) {
-                def_display = ovl_device;
-        } else {
-                dev_warn(&pdev->dev, "cannot find default display\n");
-                def_display = NULL;
+        def_display = NULL;
+
+        for (i = 0; i < fbdev->num_displays; ++i) {
+                struct omap_dss_device *dssdev;
+                const char *def_name;
+
+                def_name = omapdss_get_default_display_name();
+
+                dssdev = fbdev->displays[i].dssdev;
+
+                if (def_name == NULL ||
+                        (dssdev->name && strcmp(def_name, dssdev->name) == 0)) {
+                        def_display = dssdev;
+                        break;
+                }
+        }
+
+        if (def_display == NULL) {
+                dev_err(fbdev->dev, "failed to find default display\n");
+                r = -EINVAL;
+                goto cleanup;
+        }
+
+        r = omapfb_init_connections(fbdev, def_display);
+        if (r) {
+                dev_err(fbdev->dev, "failed to init overlay connections\n");
+                goto cleanup;
         }
 
         if (def_mode && strlen(def_mode) > 0) {
@@ -2506,6 +2573,7 @@ static int __init omapfb_probe(struct platform_device *pdev)
 
 cleanup:
         omapfb_free_resources(fbdev);
+        omapdss_compat_uninit();
 err0:
         dev_err(&pdev->dev, "failed to setup omapfb\n");
         return r;
@@ -2521,6 +2589,8 @@ static int __exit omapfb_remove(struct platform_device *pdev)
 
         omapfb_free_resources(fbdev);
 
+        omapdss_compat_uninit();
+
         return 0;
 }