[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [RFC v3 23/45] video: dma-mapping: Use unsigned long for dma_attrs



Split out subsystem specific changes for easier reviews. This will be
squashed with main commit.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
---
 drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 12 ++++++------
 drivers/video/fbdev/omap2/omapfb/omapfb.h      |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c 
b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index d3af01c94a58..59172a2185c0 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1332,7 +1332,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi)
        }
 
        dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle,
-                       &rg->attrs);
+                       rg->attrs);
 
        rg->token = NULL;
        rg->vaddr = NULL;
@@ -1370,7 +1370,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, 
unsigned long size,
        struct omapfb2_device *fbdev = ofbi->fbdev;
        struct omapfb2_mem_region *rg;
        void *token;
-       DEFINE_DMA_ATTRS(attrs);
+       unsigned long attrs;
        dma_addr_t dma_handle;
        int r;
 
@@ -1386,15 +1386,15 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, 
unsigned long size,
 
        size = PAGE_ALIGN(size);
 
-       dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
+       attrs = DMA_ATTR_WRITE_COMBINE;
 
        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-               dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs);
+               attrs |= DMA_ATTR_NO_KERNEL_MAPPING;
 
        DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
 
        token = dma_alloc_attrs(fbdev->dev, size, &dma_handle,
-                       GFP_KERNEL, &attrs);
+                       GFP_KERNEL, attrs);
 
        if (token == NULL) {
                dev_err(fbdev->dev, "failed to allocate framebuffer\n");
@@ -1408,7 +1408,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, 
unsigned long size,
                r = omap_vrfb_request_ctx(&rg->vrfb);
                if (r) {
                        dma_free_attrs(fbdev->dev, size, token, dma_handle,
-                                       &attrs);
+                                       attrs);
                        dev_err(fbdev->dev, "vrfb create ctx failed\n");
                        return r;
                }
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb.h 
b/drivers/video/fbdev/omap2/omapfb/omapfb.h
index 623cd872a367..8aaa2f643820 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb.h
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb.h
@@ -28,7 +28,6 @@
 #endif
 
 #include <linux/rwsem.h>
-#include <linux/dma-attrs.h>
 #include <linux/dma-mapping.h>
 
 #include <video/omapdss.h>
@@ -51,7 +50,7 @@ extern bool omapfb_debug;
 
 struct omapfb2_mem_region {
        int             id;
-       struct dma_attrs attrs;
+       unsigned long   attrs;
        void            *token;
        dma_addr_t      dma_handle;
        u32             paddr;
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.