exynos: support DRM_IOCTL_EXYNOS_GEM_MAP

The commit d41b7a3a745a("exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/
MMAP} ioctls") removed it same with the ioctl that this patch adds. The
reason that removed DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET was we could use
DRM_IOCTL_MODE_MAP_DUMB. Both did exactly same thing.

Now exynos-drm driver of linux kernel revives it as DRM_EXYNOS_GEM_MAP
because of render node. DRM_IOCTL_MODE_MAP_DUMB isn't permitted in
render node, so this patch also supports DRM_IOCTL_EXYNOS_GEM_MAP.

Change-Id: Ib548dc8a6bea076375465f64ee2fdd658a90e435
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

exynos: fix build warnings

Fix build warnings to exynos_fimg2d module.

This patch fixes below two build warnings,

exynos_fimg2d.c: In function 'g2d_scale_and_blend':
exynos_fimg2d.c:978:3: warning: 'scale_y' may be used uninitialized in this function [-Wmaybe-uninitialized]
   g2d_add_cmd(ctx, SRC_YSCALE_REG, scale_y);
   ^
exynos_fimg2d.c:977:3: warning: 'scale_x' may be used uninitialized in this function [-Wmaybe-uninitialized]
   g2d_add_cmd(ctx, SRC_XSCALE_REG, scale_x);

Change-Id: I70908088c61b85570aec6e3ec19b405df4820d37
Signed-off-by: Inki Dae <inki.dae@samsung.com>

4 files changed, 21 insertions, 6 deletions

diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index b008ad73..b593eb6c 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -282,14 +282,14 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
 {
 	if (!bo->vaddr) {
 		struct exynos_device *dev = bo->dev;
-		struct drm_mode_map_dumb arg;
+		struct drm_exynos_gem_map arg;
 		void *map = NULL;
 		int ret;
 
 		memset(&arg, 0, sizeof(arg));
 		arg.handle = bo->handle;
 
-		ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
+		ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MAP, &arg);
 		if (ret) {
 			fprintf(stderr, "failed to map dumb buffer[%s].\n",
 				strerror(errno));
diff --git a/exynos/exynos_drm.h b/exynos/exynos_drm.h
index 50181c40..bb7ddb61 100644
--- a/exynos/exynos_drm.h
+++ b/exynos/exynos_drm.h
@@ -47,6 +47,19 @@ struct drm_exynos_gem_create {
 };
 
 /**
+ * A structure for getting a fake-offset that can be used with mmap.
+ *
+ * @handle: handle of gem object.
+ * @reserved: just padding to be 64-bit aligned.
+ * @offset: a fake-offset of gem object.
+ */
+struct drm_exynos_gem_map {
+	__u32 handle;
+	__u32 reserved;
+	__u64 offset;
+};
+
+/**
  * A structure to gem information.
  *
  * @handle: a handle to gem object created.
@@ -132,6 +145,7 @@ struct drm_exynos_g2d_exec {
 };
 
 #define DRM_EXYNOS_GEM_CREATE		0x00
+#define DRM_EXYNOS_GEM_MAP		0x01
 /* Reserved 0x04 ~ 0x05 for exynos specific gem ioctl */
 #define DRM_EXYNOS_GEM_GET		0x04
 #define DRM_EXYNOS_VIDI_CONNECTION	0x07
@@ -143,7 +157,8 @@ struct drm_exynos_g2d_exec {
 
 #define DRM_IOCTL_EXYNOS_GEM_CREATE		DRM_IOWR(DRM_COMMAND_BASE + \
 		DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
-
+#define DRM_IOCTL_EXYNOS_GEM_MAP		DRM_IOWR(DRM_COMMAND_BASE + \
+		DRM_EXYNOS_GEM_MAP, struct drm_exynos_gem_map)
 #define DRM_IOCTL_EXYNOS_GEM_GET	DRM_IOWR(DRM_COMMAND_BASE + \
 		DRM_EXYNOS_GEM_GET,	struct drm_exynos_gem_info)
 
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index ac6fa687..1d09a3b6 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -913,7 +913,7 @@ g2d_scale_and_blend(struct g2d_context *ctx, struct g2d_image *src,
 	union g2d_bitblt_cmd_val bitblt;
 	union g2d_blend_func_val blend;
 	unsigned int scale, gem_space;
-	unsigned int scale_x, scale_y;
+	unsigned int scale_x = 0, scale_y = 0;
 
 	if (src_w == dst_w && src_h == dst_h)
 		scale = 0;
diff --git a/libkms/exynos.c b/libkms/exynos.c
index ef64a668..070edfc6 100644
--- a/libkms/exynos.c
+++ b/libkms/exynos.c
@@ -136,7 +136,7 @@ static int
 exynos_bo_map(struct kms_bo *_bo, void **out)
 {
 	struct exynos_bo *bo = (struct exynos_bo *)_bo;
-	struct drm_mode_map_dumb arg;
+	struct drm_exynos_gem_map arg;
 	void *map = NULL;
 	int ret;
 
@@ -149,7 +149,7 @@ exynos_bo_map(struct kms_bo *_bo, void **out)
 	memset(&arg, 0, sizeof(arg));
 	arg.handle = bo->base.handle;
 
-	ret = drmIoctl(bo->base.kms->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
+	ret = drmIoctl(bo->base.kms->fd, DRM_IOCTL_EXYNOS_GEM_MAP, &arg);
 	if (ret)
 		return ret;