From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Tue, 22 Dec 2015 00:54:31 +0000 (+0900)
Subject: drm/exynos: fix imported dma-buf to be mapped
X-Git-Tag: submit/tizen/20151222.042943^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F55111%2F1;p=platform%2Fkernel%2Flinux-exynos.git

drm/exynos: fix imported dma-buf to be mapped

The imported dma-buf should be mapped by sub-system exporting it.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
[jy0922.shim: Be backported from upstream but not posted]

Change-Id: I59984d8111f058decf83afbda4d2df2e1edf305e
---

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index a1c573990294..74f66904b39d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -12,6 +12,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_vma_manager.h>
 
+#include <linux/dma-buf.h>
 #include <linux/shmem_fs.h>
 #include <drm/exynos_drm.h>
 
@@ -662,5 +663,8 @@ int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 
 	obj = vma->vm_private_data;
 
+	if (obj->import_attach)
+		return dma_buf_mmap(obj->dma_buf, vma, 0);
+
 	return exynos_drm_gem_mmap_obj(obj, vma);
 }