Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[deliverable/linux.git] / drivers / gpu / drm / mediatek / mtk_drm_gem.c

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index fa2ec0cd00e8ea531381b8b05d62c9c0931b362b..7abc550ebc0021b301dc6b9cfaa59aa3b8b9ca00 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -54,15 +54,14 @@ struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
 
        obj = &mtk_gem->base;
 
-       init_dma_attrs(&mtk_gem->dma_attrs);
-       dma_set_attr(DMA_ATTR_WRITE_COMBINE, &mtk_gem->dma_attrs);
+       mtk_gem->dma_attrs = DMA_ATTR_WRITE_COMBINE;
 
        if (!alloc_kmap)
-               dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &mtk_gem->dma_attrs);
+               mtk_gem->dma_attrs |= DMA_ATTR_NO_KERNEL_MAPPING;
 
        mtk_gem->cookie = dma_alloc_attrs(priv->dma_dev, obj->size,
                                          &mtk_gem->dma_addr, GFP_KERNEL,
-                                         &mtk_gem->dma_attrs);
+                                         mtk_gem->dma_attrs);
        if (!mtk_gem->cookie) {
                DRM_ERROR("failed to allocate %zx byte dma buffer", obj->size);
                ret = -ENOMEM;
@@ -93,7 +92,7 @@ void mtk_drm_gem_free_object(struct drm_gem_object *obj)
                drm_prime_gem_destroy(obj, mtk_gem->sg);
        else
                dma_free_attrs(priv->dma_dev, obj->size, mtk_gem->cookie,
-                              mtk_gem->dma_addr, &mtk_gem->dma_attrs);
+                              mtk_gem->dma_addr, mtk_gem->dma_attrs);
 
        /* release file pointer to gem object. */
        drm_gem_object_release(obj);
@@ -173,7 +172,7 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
        vma->vm_pgoff = 0;
 
        ret = dma_mmap_attrs(priv->dma_dev, vma, mtk_gem->cookie,
-                            mtk_gem->dma_addr, obj->size, &mtk_gem->dma_attrs);
+                            mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs);
        if (ret)
                drm_gem_vm_close(vma);
 
@@ -224,7 +223,7 @@ struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
 
        ret = dma_get_sgtable_attrs(priv->dma_dev, sgt, mtk_gem->cookie,
                                    mtk_gem->dma_addr, obj->size,
-                                   &mtk_gem->dma_attrs);
+                                   mtk_gem->dma_attrs);
        if (ret) {
                DRM_ERROR("failed to allocate sgt, %d\n", ret);
                kfree(sgt);