drm/etnaviv: Fix page property being used for non writecombine buffers

In the etnaviv_gem_vmap_impl() function, the driver vmap whatever buffers
with write combine(WC) page property, this is incorrect. Cached buffers
should be mapped with the cached page property and uncached buffers should
be mapped with the uncached page property.

Fixes: a0a5ab3e99b8 ("drm/etnaviv: call correct function when trying to vmap a DMABUF")
Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 16473c371444c22c67138cc70d4f1892a653ea54..da30179de02b53c6bfaee370ebd7df6b211f9c25 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -342,6 +342,7 @@ void *etnaviv_gem_vmap(struct drm_gem_object *obj)
 static void *etnaviv_gem_vmap_impl(struct etnaviv_gem_object *obj)
 {
        struct page **pages;
+       pgprot_t prot;
 
        lockdep_assert_held(&obj->lock);
 
@@ -349,8 +350,19 @@ static void *etnaviv_gem_vmap_impl(struct etnaviv_gem_object *obj)
        if (IS_ERR(pages))
                return NULL;
 
-       return vmap(pages, obj->base.size >> PAGE_SHIFT,
-                       VM_MAP, pgprot_writecombine(PAGE_KERNEL));
+       switch (obj->flags & ETNA_BO_CACHE_MASK) {
+       case ETNA_BO_CACHED:
+               prot = PAGE_KERNEL;
+               break;
+       case ETNA_BO_UNCACHED:
+               prot = pgprot_noncached(PAGE_KERNEL);
+               break;
+       case ETNA_BO_WC:
+       default:
+               prot = pgprot_writecombine(PAGE_KERNEL);
+       }
+
+       return vmap(pages, obj->base.size >> PAGE_SHIFT, VM_MAP, prot);
 }
 
 static inline enum dma_data_direction etnaviv_op_to_dma_dir(u32 op)