1 files changed, 125 insertions, 107 deletions

diff --git a/drivers/gpu/pvr/servicesext.h b/drivers/gpu/pvr/servicesext.h
index 6f7270561a8..609df3138fc 100644
--- a/drivers/gpu/pvr/servicesext.h
+++ b/drivers/gpu/pvr/servicesext.h
@@ -86,6 +86,8 @@ typedef enum _PVRSRV_ERROR_
 
         PVRSRV_ERROR_REGISTER_BASE_NOT_SET,
 
+    PVRSRV_ERROR_BM_BAD_SHAREMEM_HANDLE,
+
         PVRSRV_ERROR_FAILED_TO_ALLOC_USER_MEM,
         PVRSRV_ERROR_FAILED_TO_ALLOC_VP_MEMORY,
         PVRSRV_ERROR_FAILED_TO_MAP_SHARED_PBDESC,
@@ -434,62 +436,62 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
 
         
         PVRSRV_PIXEL_FORMAT_G16R16                              = 101,  
-        PVRSRV_PIXEL_FORMAT_G16R16F                             = 102,
-        PVRSRV_PIXEL_FORMAT_G16R16_UINT                 = 103,
-        PVRSRV_PIXEL_FORMAT_G16R16_UNORM                = 104,
-        PVRSRV_PIXEL_FORMAT_G16R16_SINT                 = 105,
-        PVRSRV_PIXEL_FORMAT_G16R16_SNORM                = 106,
-
-
-        PVRSRV_PIXEL_FORMAT_R16                                 = 107,
-        PVRSRV_PIXEL_FORMAT_R16F                                = 108,
-        PVRSRV_PIXEL_FORMAT_R16_UINT                    = 109,
-        PVRSRV_PIXEL_FORMAT_R16_UNORM                   = 110,
-        PVRSRV_PIXEL_FORMAT_R16_SINT                    = 111,
-        PVRSRV_PIXEL_FORMAT_R16_SNORM                   = 112,
-
-
-        PVRSRV_PIXEL_FORMAT_X8R8G8B8                    = 113,
-        PVRSRV_PIXEL_FORMAT_X8R8G8B8_UNORM              = 114,
-        PVRSRV_PIXEL_FORMAT_X8R8G8B8_UNORM_SRGB = 115,
-
-        PVRSRV_PIXEL_FORMAT_A8R8G8B8                    = 116,
-        PVRSRV_PIXEL_FORMAT_A8R8G8B8_UNORM              = 117,
-        PVRSRV_PIXEL_FORMAT_A8R8G8B8_UNORM_SRGB = 118,
+        PVRSRV_PIXEL_FORMAT_G16R16F                             = 102,  
+        PVRSRV_PIXEL_FORMAT_G16R16_UINT                 = 103,  
+        PVRSRV_PIXEL_FORMAT_G16R16_UNORM                = 104,  
+        PVRSRV_PIXEL_FORMAT_G16R16_SINT                 = 105,  
+        PVRSRV_PIXEL_FORMAT_G16R16_SNORM                = 106,  
 
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8                    = 119,
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UINT               = 120,
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UNORM              = 121,
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UNORM_SRGB = 122,
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8_SINT               = 123,
-        PVRSRV_PIXEL_FORMAT_A8B8G8R8_SNORM              = 124,
-
-
-        PVRSRV_PIXEL_FORMAT_G8R8                                = 125,
-        PVRSRV_PIXEL_FORMAT_G8R8_UINT                   = 126,
-        PVRSRV_PIXEL_FORMAT_G8R8_UNORM                  = 127,
-        PVRSRV_PIXEL_FORMAT_G8R8_SINT                   = 128,
-        PVRSRV_PIXEL_FORMAT_G8R8_SNORM                  = 129,
+        
+        PVRSRV_PIXEL_FORMAT_R16                                 = 107,  
+        PVRSRV_PIXEL_FORMAT_R16F                                = 108,  
+        PVRSRV_PIXEL_FORMAT_R16_UINT                    = 109,  
+        PVRSRV_PIXEL_FORMAT_R16_UNORM                   = 110,  
+        PVRSRV_PIXEL_FORMAT_R16_SINT                    = 111,  
+        PVRSRV_PIXEL_FORMAT_R16_SNORM                   = 112,  
 
+        
+        PVRSRV_PIXEL_FORMAT_X8R8G8B8                    = 113,  
+        PVRSRV_PIXEL_FORMAT_X8R8G8B8_UNORM              = 114,  
+        PVRSRV_PIXEL_FORMAT_X8R8G8B8_UNORM_SRGB = 115,  
 
-        PVRSRV_PIXEL_FORMAT_A8                                  = 130,
-        PVRSRV_PIXEL_FORMAT_R8                                  = 131,
-        PVRSRV_PIXEL_FORMAT_R8_UINT                             = 132,
-        PVRSRV_PIXEL_FORMAT_R8_UNORM                    = 133,
-        PVRSRV_PIXEL_FORMAT_R8_SINT                             = 134,
-        PVRSRV_PIXEL_FORMAT_R8_SNORM                    = 135,
+        PVRSRV_PIXEL_FORMAT_A8R8G8B8                    = 116,  
+        PVRSRV_PIXEL_FORMAT_A8R8G8B8_UNORM              = 117,  
+        PVRSRV_PIXEL_FORMAT_A8R8G8B8_UNORM_SRGB = 118,  
 
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8                    = 119,  
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UINT               = 120,  
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UNORM              = 121,  
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8_UNORM_SRGB = 122,  
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8_SINT               = 123,  
+        PVRSRV_PIXEL_FORMAT_A8B8G8R8_SNORM              = 124,  
 
-        PVRSRV_PIXEL_FORMAT_A2B10G10R10                 = 136,
-        PVRSRV_PIXEL_FORMAT_A2B10G10R10_UNORM   = 137,
-        PVRSRV_PIXEL_FORMAT_A2B10G10R10_UINT    = 138,
+        
+        PVRSRV_PIXEL_FORMAT_G8R8                                = 125,  
+        PVRSRV_PIXEL_FORMAT_G8R8_UINT                   = 126,  
+        PVRSRV_PIXEL_FORMAT_G8R8_UNORM                  = 127,  
+        PVRSRV_PIXEL_FORMAT_G8R8_SINT                   = 128,  
+        PVRSRV_PIXEL_FORMAT_G8R8_SNORM                  = 129,  
 
+        
+        PVRSRV_PIXEL_FORMAT_A8                                  = 130,  
+        PVRSRV_PIXEL_FORMAT_R8                                  = 131,  
+        PVRSRV_PIXEL_FORMAT_R8_UINT                             = 132,  
+        PVRSRV_PIXEL_FORMAT_R8_UNORM                    = 133,  
+        PVRSRV_PIXEL_FORMAT_R8_SINT                             = 134,  
+        PVRSRV_PIXEL_FORMAT_R8_SNORM                    = 135,  
 
-        PVRSRV_PIXEL_FORMAT_B10G11R11                   = 139,
-        PVRSRV_PIXEL_FORMAT_B10G11R11F                  = 140,
+        
+        PVRSRV_PIXEL_FORMAT_A2B10G10R10                 = 136,  
+        PVRSRV_PIXEL_FORMAT_A2B10G10R10_UNORM   = 137,  
+        PVRSRV_PIXEL_FORMAT_A2B10G10R10_UINT    = 138,  
 
+        
+        PVRSRV_PIXEL_FORMAT_B10G11R11                   = 139,  
+        PVRSRV_PIXEL_FORMAT_B10G11R11F                  = 140,  
 
-        PVRSRV_PIXEL_FORMAT_X24G8R32                    = 141,
+        
+        PVRSRV_PIXEL_FORMAT_X24G8R32                    = 141,  
         PVRSRV_PIXEL_FORMAT_G8R24                               = 142,  
         PVRSRV_PIXEL_FORMAT_X8R24                               = 143,
         PVRSRV_PIXEL_FORMAT_E5B9G9R9                    = 144,  
@@ -511,20 +513,20 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
         PVRSRV_PIXEL_FORMAT_RESERVED19                  = 159,
         PVRSRV_PIXEL_FORMAT_RESERVED20                  = 160,
 
+        
+        PVRSRV_PIXEL_FORMAT_UBYTE4                              = 161,  
+        PVRSRV_PIXEL_FORMAT_SHORT4                              = 162,  
+        PVRSRV_PIXEL_FORMAT_SHORT4N                             = 163,  
+        PVRSRV_PIXEL_FORMAT_USHORT4N                    = 164,  
+        PVRSRV_PIXEL_FORMAT_SHORT2N                             = 165,  
+        PVRSRV_PIXEL_FORMAT_SHORT2                              = 166,  
+        PVRSRV_PIXEL_FORMAT_USHORT2N                    = 167,  
+        PVRSRV_PIXEL_FORMAT_UDEC3                               = 168,  
+        PVRSRV_PIXEL_FORMAT_DEC3N                               = 169,  
+        PVRSRV_PIXEL_FORMAT_F16_2                               = 170,  
+        PVRSRV_PIXEL_FORMAT_F16_4                               = 171,  
 
-        PVRSRV_PIXEL_FORMAT_UBYTE4                              = 161,
-        PVRSRV_PIXEL_FORMAT_SHORT4                              = 162,
-        PVRSRV_PIXEL_FORMAT_SHORT4N                             = 163,
-        PVRSRV_PIXEL_FORMAT_USHORT4N                    = 164,
-        PVRSRV_PIXEL_FORMAT_SHORT2N                             = 165,
-        PVRSRV_PIXEL_FORMAT_SHORT2                              = 166,
-        PVRSRV_PIXEL_FORMAT_USHORT2N                    = 167,
-        PVRSRV_PIXEL_FORMAT_UDEC3                               = 168,
-        PVRSRV_PIXEL_FORMAT_DEC3N                               = 169,
-        PVRSRV_PIXEL_FORMAT_F16_2                               = 170,
-        PVRSRV_PIXEL_FORMAT_F16_4                               = 171,
-
-
+        
         PVRSRV_PIXEL_FORMAT_L_F16                               = 172,
         PVRSRV_PIXEL_FORMAT_L_F16_REP                   = 173,
         PVRSRV_PIXEL_FORMAT_L_F16_A_F16                 = 174,
@@ -535,7 +537,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
         PVRSRV_PIXEL_FORMAT_A_F32                               = 178,
         PVRSRV_PIXEL_FORMAT_L_F32_A_F32                 = 179,
 
-
+        
         PVRSRV_PIXEL_FORMAT_PVRTC2                              = 180,
         PVRSRV_PIXEL_FORMAT_PVRTC4                              = 181,
         PVRSRV_PIXEL_FORMAT_PVRTCII2                    = 182,
@@ -552,7 +554,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
         PVRSRV_PIXEL_FORMAT_MONO8                               = 193,
         PVRSRV_PIXEL_FORMAT_MONO16                              = 194,
 
-
+        
         PVRSRV_PIXEL_FORMAT_C0_YUYV                             = 195,
         PVRSRV_PIXEL_FORMAT_C0_UYVY                             = 196,
         PVRSRV_PIXEL_FORMAT_C0_YVYU                             = 197,
@@ -562,7 +564,7 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
         PVRSRV_PIXEL_FORMAT_C1_YVYU                             = 201,
         PVRSRV_PIXEL_FORMAT_C1_VYUY                             = 202,
 
-
+        
         PVRSRV_PIXEL_FORMAT_C0_YUV420_2P_UV             = 203,
         PVRSRV_PIXEL_FORMAT_C0_YUV420_2P_VU             = 204,
         PVRSRV_PIXEL_FORMAT_C0_YUV420_3P                = 205,
@@ -573,11 +575,19 @@ typedef enum _PVRSRV_PIXEL_FORMAT_ {
         PVRSRV_PIXEL_FORMAT_A2B10G10R10F                = 209,
         PVRSRV_PIXEL_FORMAT_B8G8R8_SINT                 = 210,
         PVRSRV_PIXEL_FORMAT_PVRF32SIGNMASK              = 211,
-
+        
         PVRSRV_PIXEL_FORMAT_ABGR4444                    = 212,  
         PVRSRV_PIXEL_FORMAT_ABGR1555                    = 213,
-        PVRSRV_PIXEL_FORMAT_BGR565                              = 214,
+        PVRSRV_PIXEL_FORMAT_BGR565                              = 214,                  
 
+        
+        PVRSRV_PIXEL_FORMAT_C0_4KYUV420_2P_UV   = 215,
+        PVRSRV_PIXEL_FORMAT_C0_4KYUV420_2P_VU   = 216,
+        PVRSRV_PIXEL_FORMAT_C1_4KYUV420_2P_UV   = 217,
+        PVRSRV_PIXEL_FORMAT_C1_4KYUV420_2P_VU   = 218,
+        PVRSRV_PIXEL_FORMAT_P208                                = 219,                  
+        PVRSRV_PIXEL_FORMAT_A8P8                                = 220,                  
+                
         PVRSRV_PIXEL_FORMAT_FORCE_I32                   = 0x7fffffff
 
 } PVRSRV_PIXEL_FORMAT;
@@ -612,15 +622,15 @@ typedef enum _PVRSRV_ROTATION_ {
 
 typedef struct _PVRSRV_SYNC_DATA_
 {
-
+        
         IMG_UINT32                                      ui32WriteOpsPending;
         volatile IMG_UINT32                     ui32WriteOpsComplete;
 
-
+        
         IMG_UINT32                                      ui32ReadOpsPending;
         volatile IMG_UINT32                     ui32ReadOpsComplete;
 
-
+        
         IMG_UINT32                                      ui32LastOpDumpVal;
         IMG_UINT32                                      ui32LastReadOpDumpVal;
 
@@ -628,30 +638,37 @@ typedef struct _PVRSRV_SYNC_DATA_
 
 typedef struct _PVRSRV_CLIENT_SYNC_INFO_
 {
+        
+        PVRSRV_SYNC_DATA                *psSyncData;
 
-        PVRSRV_SYNC_DATA                        *psSyncData;
-
-
-
+        
 
 
+        
         IMG_DEV_VIRTADDR                sWriteOpsCompleteDevVAddr;
 
-
+        
         IMG_DEV_VIRTADDR                sReadOpsCompleteDevVAddr;
 
+        
+#if defined (SUPPORT_SID_INTERFACE)
+        IMG_SID                                 hMappingInfo;
 
+        
+        IMG_SID                                 hKernelSyncInfo;
+#else
         IMG_HANDLE                                      hMappingInfo;
 
-
+        
         IMG_HANDLE                                      hKernelSyncInfo;
+#endif
 
 } PVRSRV_CLIENT_SYNC_INFO, *PPVRSRV_CLIENT_SYNC_INFO;
 
 typedef struct PVRSRV_RESOURCE_TAG
 {
         volatile IMG_UINT32 ui32Lock;
-        IMG_UINT32                      ui32ID;
+        IMG_UINT32                      ui32ID;
 }PVRSRV_RESOURCE;
 typedef PVRSRV_RESOURCE PVRSRV_RES_HANDLE;
 
@@ -700,52 +717,52 @@ typedef struct DISPLAY_DIMS_TAG
 
 typedef struct DISPLAY_FORMAT_TAG
 {
-
+        
         PVRSRV_PIXEL_FORMAT             pixelformat;
 } DISPLAY_FORMAT;
 
 typedef struct DISPLAY_SURF_ATTRIBUTES_TAG
 {
-
+        
         PVRSRV_PIXEL_FORMAT             pixelformat;
-
+        
         DISPLAY_DIMS                    sDims;
 } DISPLAY_SURF_ATTRIBUTES;
 
 
 typedef struct DISPLAY_MODE_INFO_TAG
 {
-
+        
         PVRSRV_PIXEL_FORMAT             pixelformat;
-
+        
         DISPLAY_DIMS                    sDims;
-
+        
         IMG_UINT32                              ui32RefreshHZ;
-
+        
         IMG_UINT32                              ui32OEMFlags;
 } DISPLAY_MODE_INFO;
 
 
 
-#define MAX_DISPLAY_NAME_SIZE   (50)
+#define MAX_DISPLAY_NAME_SIZE   (50) 
 
 typedef struct DISPLAY_INFO_TAG
 {
-
+        
         IMG_UINT32 ui32MaxSwapChains;
-
+        
         IMG_UINT32 ui32MaxSwapChainBuffers;
-
+        
         IMG_UINT32 ui32MinSwapInterval;
-
+        
         IMG_UINT32 ui32MaxSwapInterval;
-
+        
         IMG_UINT32 ui32PhysicalWidthmm;
         IMG_UINT32 ui32PhysicalHeightmm;
-
+        
         IMG_CHAR        szDisplayName[MAX_DISPLAY_NAME_SIZE];
 #if defined(SUPPORT_HW_CURSOR)
-
+        
         IMG_UINT16      ui32CursorWidth;
         IMG_UINT16      ui32CursorHeight;
 #endif
@@ -754,9 +771,9 @@ typedef struct DISPLAY_INFO_TAG
 typedef struct ACCESS_INFO_TAG
 {
         IMG_UINT32              ui32Size;
-        IMG_UINT32      ui32FBPhysBaseAddress;
-        IMG_UINT32              ui32FBMemAvailable;
-        IMG_UINT32      ui32SysPhysBaseAddress;
+        IMG_UINT32      ui32FBPhysBaseAddress;
+        IMG_UINT32              ui32FBMemAvailable;                     
+        IMG_UINT32      ui32SysPhysBaseAddress;
         IMG_UINT32              ui32SysSize;
         IMG_UINT32              ui32DevIRQ;
 }ACCESS_INFO;
@@ -769,11 +786,11 @@ typedef struct PVRSRV_CURSOR_SHAPE_TAG
         IMG_INT16                       i16XHot;
         IMG_INT16                       i16YHot;
 
+        
+        IMG_VOID*               pvMask;
+        IMG_INT16                       i16MaskByteStride;
 
-        IMG_VOID*               pvMask;
-        IMG_INT16                       i16MaskByteStride;
-
-
+        
         IMG_VOID*                       pvColour;
         IMG_INT16                       i16ColourByteStride;
         PVRSRV_PIXEL_FORMAT     eColourPixelFormat;
@@ -786,20 +803,20 @@ typedef struct PVRSRV_CURSOR_SHAPE_TAG
 
 typedef struct PVRSRV_CURSOR_INFO_TAG
 {
-
+        
         IMG_UINT32 ui32Flags;
 
-
+        
         IMG_BOOL bVisible;
 
-
+        
         IMG_INT16 i16XPos;
         IMG_INT16 i16YPos;
 
-
+        
         PVRSRV_CURSOR_SHAPE sCursorShape;
 
-
+        
         IMG_UINT32 ui32Rotation;
 
 } PVRSRV_CURSOR_INFO;
@@ -807,13 +824,14 @@ typedef struct PVRSRV_CURSOR_INFO_TAG
 #if defined(PDUMP_SUSPEND_IS_PER_THREAD)
 typedef struct {
         IMG_UINT32 threadId;
-        int suspendCount;
+        IMG_INT    suspendCount;
 } PVRSRV_THREAD_SUSPEND_COUNT;
 
 #define PVRSRV_PDUMP_SUSPEND_Q_NAME "PVRSRVPDumpSuspendMsgQ"
 #define PVRSRV_PDUMP_SUSPEND_Q_LENGTH 8
 
-#endif
+#endif 
+
 
 typedef struct _PVRSRV_REGISTRY_INFO_
 {
@@ -835,11 +853,11 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVWriteRegistryString (PPVRSRV_REGISTRY_INFO psReg
 #define PVRSRV_BC_FLAGS_YUVCSC_BT601                    (0 << 1)
 #define PVRSRV_BC_FLAGS_YUVCSC_BT709                    (1 << 1)
 
-#define MAX_BUFFER_DEVICE_NAME_SIZE     (50)
+#define MAX_BUFFER_DEVICE_NAME_SIZE     (50) 
 
 typedef struct BUFFER_INFO_TAG
 {
-        IMG_UINT32                      ui32BufferCount;
+        IMG_UINT32                      ui32BufferCount;
         IMG_UINT32                      ui32BufferDeviceID;
         PVRSRV_PIXEL_FORMAT     pixelformat;
         IMG_UINT32                      ui32ByteStride;
@@ -857,4 +875,4 @@ typedef enum _OVERLAY_DEINTERLACE_MODE_
         BOB_EVEN_NONINTERLEAVED
 } OVERLAY_DEINTERLACE_MODE;
 
-#endif
+#endif