ENGR00317558 gpu:5.0.11p1 gpu driver kernel part integration

(cherry picked from commit a6f5349968e494d67f9da339dad433b528ce52fe)

Conflict:
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
Revert "ENGR00317981: gpu-viv: use runtime pm for VDDPU management" and
move the same change logic to file gc_hal_kernel_platform_imx6q14.c for
following p1 framework change.

Date: Jun 16, 2014
Signed-off-by: Loren Huang <b02279@freescale.com>
Signed-off-by: Shawn Xiao  <b49994@freescale.com>
Acked-by: Shawn Guo

1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
index 9cc9626e3b06..78bd8d277d34 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
@@ -180,6 +180,10 @@ typedef enum _gceHAL_COMMAND_CODES
 
     /* Destory MMU. */
     gcvHAL_DESTROY_MMU,
+
+    /* Shared buffer. */
+    gcvHAL_SHBUF,
+
 }
 gceHAL_COMMAND_CODES;
 
@@ -400,6 +404,9 @@ typedef struct _gcsHAL_INTERFACE
             /* Type of allocation. */
             IN gceSURF_TYPE             type;
 
+            /* Flag of allocation. */
+            IN gctUINT32                flag;
+
             /* Memory pool to allocate from. */
             IN OUT gcePOOL              pool;
 
@@ -467,6 +474,9 @@ typedef struct _gcsHAL_INTERFACE
 
             /* Mapped logical address. */
             OUT gctUINT64               memory;
+
+            /* Bus address of a contiguous video node. */
+            OUT gctUINT64               physicalAddress;
         }
         LockVideoMemory;
 
@@ -1075,6 +1085,22 @@ typedef struct _gcsHAL_INTERFACE
             IN gctUINT64                mmu;
         }
         DestroyMmu;
+
+        struct _gcsHAL_SHBUF
+        {
+            gceSHBUF_COMMAND_CODES      command;
+
+            /* Shared buffer. */
+            IN OUT gctUINT64            id;
+
+            /* User data to be shared. */
+            IN gctUINT64                data;
+
+            /* Data size. */
+            IN OUT gctUINT32            bytes;
+        }
+        ShBuf;
+
     }
     u;
 }