5 files changed, 52 insertions, 47 deletions

diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS
index a564ceea9e98..4484e021290e 100644
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
@@ -285,7 +285,10 @@ FB0 +-- GFX  ---- LCD ---- LCD
 Misc notes
 ----------
 
-OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator.
+OMAP FB allocates the framebuffer memory using the standard dma allocator. You
+can enable Contiguous Memory Allocator (CONFIG_CMA) to improve the dma
+allocator, and if CMA is enabled, you use "cma=" kernel parameter to increase
+the global memory area for CMA.
 
 Using DSI DPLL to generate pixel clock it is possible produce the pixel clock
 of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI.
@@ -301,11 +304,6 @@ framebuffer parameters.
 Kernel boot arguments
 ---------------------
 
-vram=<size>[,<physaddr>]
-        - Amount of total VRAM to preallocate and optionally a physical start
-          memory address. For example, "10M". omapfb allocates memory for
-          framebuffers from VRAM.
-
 omapfb.mode=<display>:<mode>[,...]
         - Default video mode for specified displays. For example,
           "dvi:800x400MR-24@60".  See drivers/video/modedb.c.
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 4ea17dc3258c..4cb12ce68855 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -2,7 +2,6 @@ menuconfig FB_OMAP2
         tristate "OMAP2+ frame buffer support"
         depends on FB && OMAP2_DSS && !DRM_OMAP
 
-        select OMAP2_VRAM
         select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 606b89f12351..574c1708f749 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -31,7 +31,6 @@
 
 #include <video/omapdss.h>
 #include <plat/vrfb.h>
-#include <plat/vram.h>
 
 #include "omapfb.h"
 
@@ -853,14 +852,15 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                 break;
 
         case OMAPFB_GET_VRAM_INFO: {
-                unsigned long vram, free, largest;
-
                 DBG("ioctl GET_VRAM_INFO\n");
 
-                omap_vram_get_info(&vram, &free, &largest);
-                p.vram_info.total = vram;
-                p.vram_info.free = free;
-                p.vram_info.largest_free_block = largest;
+                /*
+                 * We don't have the ability to get this vram info anymore.
+                 * Fill in something that should keep the applications working.
+                 */
+                p.vram_info.total = SZ_1M * 64;
+                p.vram_info.free = SZ_1M * 64;
+                p.vram_info.largest_free_block = SZ_1M * 64;
 
                 if (copy_to_user((void __user *)arg, &p.vram_info,
                                         sizeof(p.vram_info)))
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 16db1589bd91..84c10121de48 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -32,7 +32,6 @@
 
 #include <video/omapdss.h>
 #include <plat/cpu.h>
-#include <plat/vram.h>
 #include <plat/vrfb.h>
 
 #include "omapfb.h"
@@ -1336,24 +1335,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;
@@ -1388,7 +1388,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;
@@ -1403,42 +1405,43 @@ 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);
-        }
+        WARN_ONCE(paddr,
+                "reserving memory at predefined address not supported\n");
 
-        if (r) {
+        dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
+
+        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;
 
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index 5ced9b334d35..5f72bf9017fc 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -28,6 +28,8 @@
 #endif
 
 #include <linux/rwsem.h>
+#include <linux/dma-attrs.h>
+#include <linux/dma-mapping.h>
 
 #include <video/omapdss.h>
 
@@ -49,6 +51,9 @@ extern bool omapfb_debug;
 
 struct omapfb2_mem_region {
         int             id;
+        struct dma_attrs attrs;
+        void            *token;
+        dma_addr_t      dma_handle;
         u32             paddr;
         void __iomem    *vaddr;
         struct vrfb     vrfb;