From 5ef806a59f63b93e77c5f2ae189d415dc6638e2e Mon Sep 17 00:00:00 2001
From: Stanislav Vorobiov <s.vorobiov@samsung.com>
Date: Fri, 26 Apr 2013 17:46:03 +0400
Subject: [PATCH] VIGS: Return some more info for GEMs

Change-Id: Ia7b4ce407e64f36063b21d987c602af6c5ffbc16
---
 drivers/gpu/drm/vigs/vigs_execbuffer.c | 1 +
 drivers/gpu/drm/vigs/vigs_protocol.h   | 1 -
 drivers/gpu/drm/vigs/vigs_surface.c    | 2 ++
 include/drm/vigs_drm.h                 | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vigs/vigs_execbuffer.c b/drivers/gpu/drm/vigs/vigs_execbuffer.c
index 085ad4dea607..6487a919938a 100644
--- a/drivers/gpu/drm/vigs/vigs_execbuffer.c
+++ b/drivers/gpu/drm/vigs/vigs_execbuffer.c
@@ -68,6 +68,7 @@ int vigs_execbuffer_create_ioctl(struct drm_device *drm_dev,
 
     if (ret == 0) {
         args->handle = handle;
+        args->mmap_offset = vigs_gem_mmap_offset(&execbuffer->gem);
     }
 
     return ret;
diff --git a/drivers/gpu/drm/vigs/vigs_protocol.h b/drivers/gpu/drm/vigs/vigs_protocol.h
index 739490d40d48..9eaf2f287719 100644
--- a/drivers/gpu/drm/vigs/vigs_protocol.h
+++ b/drivers/gpu/drm/vigs/vigs_protocol.h
@@ -29,7 +29,6 @@ typedef vigsp_u32 vigsp_bool;
 typedef vigsp_u32 vigsp_surface_id;
 typedef vigsp_u32 vigsp_offset;
 typedef vigsp_u32 vigsp_color;
-typedef vigsp_u64 vigsp_va;
 
 typedef enum
 {
diff --git a/drivers/gpu/drm/vigs/vigs_surface.c b/drivers/gpu/drm/vigs/vigs_surface.c
index a4fa688ce341..c9ab783c131d 100644
--- a/drivers/gpu/drm/vigs/vigs_surface.c
+++ b/drivers/gpu/drm/vigs/vigs_surface.c
@@ -105,6 +105,7 @@ int vigs_surface_create_ioctl(struct drm_device *drm_dev,
 
     if (ret == 0) {
         args->handle = handle;
+        args->size = vigs_gem_size(&sfc->gem);
         args->mmap_offset = vigs_gem_mmap_offset(&sfc->gem);
         args->id = sfc->id;
     }
@@ -139,6 +140,7 @@ int vigs_surface_info_ioctl(struct drm_device *drm_dev,
     args->height = sfc->height;
     args->stride = sfc->stride;
     args->format = sfc->format;
+    args->size = vigs_gem_size(vigs_gem);
     args->mmap_offset = vigs_gem_mmap_offset(vigs_gem);
     args->id = sfc->id;
 
diff --git a/include/drm/vigs_drm.h b/include/drm/vigs_drm.h
index 56676cb31aaf..2e9daf2b5471 100644
--- a/include/drm/vigs_drm.h
+++ b/include/drm/vigs_drm.h
@@ -22,6 +22,7 @@ struct drm_vigs_create_surface
     uint32_t stride;
     uint32_t format;
     uint32_t handle;
+    uint32_t size;
     uint64_t mmap_offset;
     uint32_t id;
 };
@@ -30,6 +31,7 @@ struct drm_vigs_create_execbuffer
 {
     uint32_t size;
     uint32_t handle;
+    uint64_t mmap_offset;
 };
 
 struct drm_vigs_surface_info
@@ -39,6 +41,7 @@ struct drm_vigs_surface_info
     uint32_t height;
     uint32_t stride;
     uint32_t format;
+    uint32_t size;
     uint64_t mmap_offset;
     uint32_t id;
 };
-- 
2.34.1