Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / gpu / drm / omapdrm / omap_gem.c

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 94aef52c36ad9119f6c05cd8212e91afff065a0a..5c5c86ddd6f4777a10f5b326d2df34138ba33cf8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -182,7 +182,7 @@ static void evict_entry(struct drm_gem_object *obj,
        size_t size = PAGE_SIZE * n;
        loff_t off = mmap_offset(obj) +
                        (entry->obj_pgoff << PAGE_SHIFT);
-       const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE);
+       const int m = DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE);
 
        if (m > 1) {
                int i;
@@ -254,7 +254,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
 
                for (i = 0; i < npages; i++) {
                        addrs[i] = dma_map_page(dev->dev, pages[i],
-                                       0, PAGE_SIZE, DMA_BIDIRECTIONAL);
+                                       0, PAGE_SIZE, DMA_TO_DEVICE);
 
                        if (dma_mapping_error(dev->dev, addrs[i])) {
                                dev_warn(dev->dev,
@@ -262,7 +262,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
 
                                for (i = i - 1; i >= 0; --i) {
                                        dma_unmap_page(dev->dev, addrs[i],
-                                               PAGE_SIZE, DMA_BIDIRECTIONAL);
+                                               PAGE_SIZE, DMA_TO_DEVICE);
                                }
 
                                ret = -ENOMEM;
@@ -322,7 +322,7 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj)
        for (i = 0; i < npages; i++) {
                if (omap_obj->dma_addrs[i])
                        dma_unmap_page(obj->dev->dev, omap_obj->dma_addrs[i],
-                                      PAGE_SIZE, DMA_BIDIRECTIONAL);
+                                      PAGE_SIZE, DMA_TO_DEVICE);
        }
 
        kfree(omap_obj->dma_addrs);
@@ -424,7 +424,7 @@ static int fault_2d(struct drm_gem_object *obj,
         * into account in some of the math, so figure out virtual stride
         * in pages
         */
-       const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE);
+       const int m = DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE);
 
        /* We don't use vmf->pgoff since that has the fake offset: */
        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
@@ -744,7 +744,7 @@ void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff)
 
        if (omap_obj->dma_addrs[pgoff]) {
                dma_unmap_page(dev->dev, omap_obj->dma_addrs[pgoff],
-                               PAGE_SIZE, DMA_BIDIRECTIONAL);
+                               PAGE_SIZE, DMA_TO_DEVICE);
                omap_obj->dma_addrs[pgoff] = 0;
        }
 }
@@ -767,8 +767,7 @@ void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,
                        dma_addr_t addr;
 
                        addr = dma_map_page(dev->dev, pages[i], 0,
-                                           PAGE_SIZE, DMA_BIDIRECTIONAL);
-
+                                           PAGE_SIZE, dir);
                        if (dma_mapping_error(dev->dev, addr)) {
                                dev_warn(dev->dev, "%s: failed to map page\n",
                                        __func__);
@@ -1049,7 +1048,7 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
                                        area->p1.x, area->p1.y);
                }
        } else {
-               seq_printf(m, " %d", obj->size);
+               seq_printf(m, " %zu", obj->size);
        }
 
        seq_printf(m, "\n");