aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/pvr/sgx_bridge.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/pvr/sgx_bridge.h')
-rw-r--r--drivers/gpu/pvr/sgx_bridge.h189
1 files changed, 182 insertions, 7 deletions
diff --git a/drivers/gpu/pvr/sgx_bridge.h b/drivers/gpu/pvr/sgx_bridge.h
index 10e59196ef9..3f43f76971e 100644
--- a/drivers/gpu/pvr/sgx_bridge.h
+++ b/drivers/gpu/pvr/sgx_bridge.h
@@ -27,7 +27,11 @@
27#if !defined(__SGX_BRIDGE_H__) 27#if !defined(__SGX_BRIDGE_H__)
28#define __SGX_BRIDGE_H__ 28#define __SGX_BRIDGE_H__
29 29
30#if defined (SUPPORT_SID_INTERFACE)
31#include "sgxapi.h"
32#else
30#include "sgxapi_km.h" 33#include "sgxapi_km.h"
34#endif
31#include "sgxinfo.h" 35#include "sgxinfo.h"
32#include "pvr_bridge.h" 36#include "pvr_bridge.h"
33 37
@@ -106,8 +110,13 @@ typedef struct PVRSRV_BRIDGE_OUT_GETPHYSPAGEADDR
106typedef struct PVRSRV_BRIDGE_IN_SGX_GETMMU_PDADDR_TAG 110typedef struct PVRSRV_BRIDGE_IN_SGX_GETMMU_PDADDR_TAG
107{ 111{
108 IMG_UINT32 ui32BridgeFlags; 112 IMG_UINT32 ui32BridgeFlags;
113#if defined (SUPPORT_SID_INTERFACE)
114 IMG_SID hDevCookie;
115 IMG_SID hDevMemContext;
116#else
109 IMG_HANDLE hDevCookie; 117 IMG_HANDLE hDevCookie;
110 IMG_HANDLE hDevMemContext; 118 IMG_HANDLE hDevMemContext;
119#endif
111}PVRSRV_BRIDGE_IN_SGX_GETMMU_PDADDR; 120}PVRSRV_BRIDGE_IN_SGX_GETMMU_PDADDR;
112 121
113 122
@@ -121,7 +130,11 @@ typedef struct PVRSRV_BRIDGE_OUT_SGX_GETMMU_PDADDR_TAG
121typedef struct PVRSRV_BRIDGE_IN_GETCLIENTINFO_TAG 130typedef struct PVRSRV_BRIDGE_IN_GETCLIENTINFO_TAG
122{ 131{
123 IMG_UINT32 ui32BridgeFlags; 132 IMG_UINT32 ui32BridgeFlags;
133#if defined (SUPPORT_SID_INTERFACE)
134 IMG_SID hDevCookie;
135#else
124 IMG_HANDLE hDevCookie; 136 IMG_HANDLE hDevCookie;
137#endif
125}PVRSRV_BRIDGE_IN_GETCLIENTINFO; 138}PVRSRV_BRIDGE_IN_GETCLIENTINFO;
126 139
127 140
@@ -135,7 +148,11 @@ typedef struct PVRSRV_BRIDGE_OUT_GETINTERNALDEVINFO_TAG
135typedef struct PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO_TAG 148typedef struct PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO_TAG
136{ 149{
137 IMG_UINT32 ui32BridgeFlags; 150 IMG_UINT32 ui32BridgeFlags;
151#if defined (SUPPORT_SID_INTERFACE)
152 IMG_SID hDevCookie;
153#else
138 IMG_HANDLE hDevCookie; 154 IMG_HANDLE hDevCookie;
155#endif
139}PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO; 156}PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO;
140 157
141 158
@@ -148,8 +165,12 @@ typedef struct PVRSRV_BRIDGE_OUT_GETCLIENTINFO_TAG
148 165
149typedef struct PVRSRV_BRIDGE_IN_RELEASECLIENTINFO_TAG 166typedef struct PVRSRV_BRIDGE_IN_RELEASECLIENTINFO_TAG
150{ 167{
151 IMG_UINT32 ui32BridgeFlags; 168 IMG_UINT32 ui32BridgeFlags;
152 IMG_HANDLE hDevCookie; 169#if defined (SUPPORT_SID_INTERFACE)
170 IMG_SID hDevCookie;
171#else
172 IMG_HANDLE hDevCookie;
173#endif
153 SGX_CLIENT_INFO sClientInfo; 174 SGX_CLIENT_INFO sClientInfo;
154}PVRSRV_BRIDGE_IN_RELEASECLIENTINFO; 175}PVRSRV_BRIDGE_IN_RELEASECLIENTINFO;
155 176
@@ -157,14 +178,22 @@ typedef struct PVRSRV_BRIDGE_IN_RELEASECLIENTINFO_TAG
157typedef struct PVRSRV_BRIDGE_IN_ISPBREAKPOLL_TAG 178typedef struct PVRSRV_BRIDGE_IN_ISPBREAKPOLL_TAG
158{ 179{
159 IMG_UINT32 ui32BridgeFlags; 180 IMG_UINT32 ui32BridgeFlags;
181#if defined (SUPPORT_SID_INTERFACE)
182 IMG_SID hDevCookie;
183#else
160 IMG_HANDLE hDevCookie; 184 IMG_HANDLE hDevCookie;
185#endif
161}PVRSRV_BRIDGE_IN_ISPBREAKPOLL; 186}PVRSRV_BRIDGE_IN_ISPBREAKPOLL;
162 187
163 188
164typedef struct PVRSRV_BRIDGE_IN_DOKICK_TAG 189typedef struct PVRSRV_BRIDGE_IN_DOKICK_TAG
165{ 190{
166 IMG_UINT32 ui32BridgeFlags; 191 IMG_UINT32 ui32BridgeFlags;
192#if defined (SUPPORT_SID_INTERFACE)
193 IMG_SID hDevCookie;
194#else
167 IMG_HANDLE hDevCookie; 195 IMG_HANDLE hDevCookie;
196#endif
168 SGX_CCB_KICK sCCBKick; 197 SGX_CCB_KICK sCCBKick;
169}PVRSRV_BRIDGE_IN_DOKICK; 198}PVRSRV_BRIDGE_IN_DOKICK;
170 199
@@ -172,7 +201,11 @@ typedef struct PVRSRV_BRIDGE_IN_DOKICK_TAG
172typedef struct PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES_TAG 201typedef struct PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES_TAG
173{ 202{
174 IMG_UINT32 ui32BridgeFlags; 203 IMG_UINT32 ui32BridgeFlags;
204#if defined (SUPPORT_SID_INTERFACE)
205 IMG_SID hDevCookie;
206#else
175 IMG_HANDLE hDevCookie; 207 IMG_HANDLE hDevCookie;
208#endif
176}PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES; 209}PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES;
177 210
178 211
@@ -181,7 +214,11 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES_TAG
181typedef struct PVRSRV_BRIDGE_IN_SUBMITTRANSFER_TAG 214typedef struct PVRSRV_BRIDGE_IN_SUBMITTRANSFER_TAG
182{ 215{
183 IMG_UINT32 ui32BridgeFlags; 216 IMG_UINT32 ui32BridgeFlags;
217#if defined (SUPPORT_SID_INTERFACE)
218 IMG_SID hDevCookie;
219#else
184 IMG_HANDLE hDevCookie; 220 IMG_HANDLE hDevCookie;
221#endif
185 PVRSRV_TRANSFER_SGX_KICK sKick; 222 PVRSRV_TRANSFER_SGX_KICK sKick;
186}PVRSRV_BRIDGE_IN_SUBMITTRANSFER; 223}PVRSRV_BRIDGE_IN_SUBMITTRANSFER;
187 224
@@ -190,8 +227,12 @@ typedef struct PVRSRV_BRIDGE_IN_SUBMITTRANSFER_TAG
190typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG 227typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG
191{ 228{
192 IMG_UINT32 ui32BridgeFlags; 229 IMG_UINT32 ui32BridgeFlags;
230#if defined (SUPPORT_SID_INTERFACE)
231 IMG_SID hDevCookie;
232#else
193 IMG_HANDLE hDevCookie; 233 IMG_HANDLE hDevCookie;
194 PVRSRV_2D_SGX_KICK sKick; 234#endif
235 PVRSRV_2D_SGX_KICK sKick;
195} PVRSRV_BRIDGE_IN_SUBMIT2D; 236} PVRSRV_BRIDGE_IN_SUBMIT2D;
196#endif 237#endif
197#endif 238#endif
@@ -200,7 +241,11 @@ typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG
200typedef struct PVRSRV_BRIDGE_IN_READREGDWORD_TAG 241typedef struct PVRSRV_BRIDGE_IN_READREGDWORD_TAG
201{ 242{
202 IMG_UINT32 ui32BridgeFlags; 243 IMG_UINT32 ui32BridgeFlags;
244#if defined (SUPPORT_SID_INTERFACE)
245 IMG_SID hDevCookie;
246#else
203 IMG_HANDLE hDevCookie; 247 IMG_HANDLE hDevCookie;
248#endif
204 IMG_PCHAR pszKey; 249 IMG_PCHAR pszKey;
205 IMG_PCHAR pszValue; 250 IMG_PCHAR pszValue;
206}PVRSRV_BRIDGE_IN_READREGDWORD; 251}PVRSRV_BRIDGE_IN_READREGDWORD;
@@ -216,14 +261,22 @@ typedef struct PVRSRV_BRIDGE_OUT_READREGDWORD_TAG
216typedef struct PVRSRV_BRIDGE_IN_SGXGETMISCINFO_TAG 261typedef struct PVRSRV_BRIDGE_IN_SGXGETMISCINFO_TAG
217{ 262{
218 IMG_UINT32 ui32BridgeFlags; 263 IMG_UINT32 ui32BridgeFlags;
264#if defined (SUPPORT_SID_INTERFACE)
265 IMG_SID hDevCookie;
266#else
219 IMG_HANDLE hDevCookie; 267 IMG_HANDLE hDevCookie;
268#endif
220 SGX_MISC_INFO *psMiscInfo; 269 SGX_MISC_INFO *psMiscInfo;
221}PVRSRV_BRIDGE_IN_SGXGETMISCINFO; 270}PVRSRV_BRIDGE_IN_SGXGETMISCINFO;
222 271
223typedef struct PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT_TAG 272typedef struct PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT_TAG
224{ 273{
225 IMG_UINT32 ui32BridgeFlags; 274 IMG_UINT32 ui32BridgeFlags;
275#if defined (SUPPORT_SID_INTERFACE)
276 IMG_SID hDevCookie;
277#else
226 IMG_HANDLE hDevCookie; 278 IMG_HANDLE hDevCookie;
279#endif
227}PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT; 280}PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT;
228 281
229typedef struct PVRSRV_BRIDGE_OUT_SGXINFO_FOR_SRVINIT_TAG 282typedef struct PVRSRV_BRIDGE_OUT_SGXINFO_FOR_SRVINIT_TAG
@@ -235,16 +288,32 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXINFO_FOR_SRVINIT_TAG
235typedef struct PVRSRV_BRIDGE_IN_SGXDEVINITPART2_TAG 288typedef struct PVRSRV_BRIDGE_IN_SGXDEVINITPART2_TAG
236{ 289{
237 IMG_UINT32 ui32BridgeFlags; 290 IMG_UINT32 ui32BridgeFlags;
291#if defined (SUPPORT_SID_INTERFACE)
292 IMG_SID hDevCookie;
293#else
238 IMG_HANDLE hDevCookie; 294 IMG_HANDLE hDevCookie;
295#endif
239 SGX_BRIDGE_INIT_INFO sInitInfo; 296 SGX_BRIDGE_INIT_INFO sInitInfo;
240}PVRSRV_BRIDGE_IN_SGXDEVINITPART2; 297}PVRSRV_BRIDGE_IN_SGXDEVINITPART2;
241 298
299typedef struct PVRSRV_BRIDGE_OUT_SGXDEVINITPART2_TAG
300{
301 PVRSRV_ERROR eError;
302 IMG_UINT32 ui32KMBuildOptions;
303
304}PVRSRV_BRIDGE_OUT_SGXDEVINITPART2;
305
242 306
243typedef struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE_TAG 307typedef struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE_TAG
244{ 308{
245 IMG_UINT32 ui32BridgeFlags; 309 IMG_UINT32 ui32BridgeFlags;
310#if defined (SUPPORT_SID_INTERFACE)
311 IMG_SID hDevCookie;
312 IMG_SID hKernSyncInfo;
313#else
246 IMG_HANDLE hDevCookie; 314 IMG_HANDLE hDevCookie;
247 IMG_HANDLE hKernSyncInfo; 315 IMG_HANDLE hKernSyncInfo;
316#endif
248 IMG_BOOL bWaitForComplete; 317 IMG_BOOL bWaitForComplete;
249}PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE; 318}PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE;
250 319
@@ -254,13 +323,26 @@ typedef struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE_TAG
254typedef struct PVRSRV_BRIDGE_IN_SGXFINDSHAREDPBDESC_TAG 323typedef struct PVRSRV_BRIDGE_IN_SGXFINDSHAREDPBDESC_TAG
255{ 324{
256 IMG_UINT32 ui32BridgeFlags; 325 IMG_UINT32 ui32BridgeFlags;
326#if defined (SUPPORT_SID_INTERFACE)
327 IMG_SID hDevCookie;
328#else
257 IMG_HANDLE hDevCookie; 329 IMG_HANDLE hDevCookie;
258 IMG_BOOL bLockOnFailure; 330#endif
331 IMG_BOOL bLockOnFailure;
259 IMG_UINT32 ui32TotalPBSize; 332 IMG_UINT32 ui32TotalPBSize;
260}PVRSRV_BRIDGE_IN_SGXFINDSHAREDPBDESC; 333}PVRSRV_BRIDGE_IN_SGXFINDSHAREDPBDESC;
261 334
262typedef struct PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC_TAG 335typedef struct PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC_TAG
263{ 336{
337#if defined (SUPPORT_SID_INTERFACE)
338 IMG_SID hKernelMemInfo;
339 IMG_SID hSharedPBDesc;
340 IMG_SID hSharedPBDescKernelMemInfoHandle;
341 IMG_SID hHWPBDescKernelMemInfoHandle;
342 IMG_SID hBlockKernelMemInfoHandle;
343 IMG_SID hHWBlockKernelMemInfoHandle;
344 IMG_SID ahSharedPBDescSubKernelMemInfoHandles[PVRSRV_BRIDGE_SGX_SHAREDPBDESC_MAX_SUBMEMINFOS];
345#else
264 IMG_HANDLE hKernelMemInfo; 346 IMG_HANDLE hKernelMemInfo;
265 IMG_HANDLE hSharedPBDesc; 347 IMG_HANDLE hSharedPBDesc;
266 IMG_HANDLE hSharedPBDescKernelMemInfoHandle; 348 IMG_HANDLE hSharedPBDescKernelMemInfoHandle;
@@ -268,6 +350,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC_TAG
268 IMG_HANDLE hBlockKernelMemInfoHandle; 350 IMG_HANDLE hBlockKernelMemInfoHandle;
269 IMG_HANDLE hHWBlockKernelMemInfoHandle; 351 IMG_HANDLE hHWBlockKernelMemInfoHandle;
270 IMG_HANDLE ahSharedPBDescSubKernelMemInfoHandles[PVRSRV_BRIDGE_SGX_SHAREDPBDESC_MAX_SUBMEMINFOS]; 352 IMG_HANDLE ahSharedPBDescSubKernelMemInfoHandles[PVRSRV_BRIDGE_SGX_SHAREDPBDESC_MAX_SUBMEMINFOS];
353#endif
271 IMG_UINT32 ui32SharedPBDescSubKernelMemInfoHandlesCount; 354 IMG_UINT32 ui32SharedPBDescSubKernelMemInfoHandlesCount;
272 PVRSRV_ERROR eError; 355 PVRSRV_ERROR eError;
273}PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC; 356}PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC;
@@ -275,7 +358,11 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC_TAG
275typedef struct PVRSRV_BRIDGE_IN_SGXUNREFSHAREDPBDESC_TAG 358typedef struct PVRSRV_BRIDGE_IN_SGXUNREFSHAREDPBDESC_TAG
276{ 359{
277 IMG_UINT32 ui32BridgeFlags; 360 IMG_UINT32 ui32BridgeFlags;
361#if defined (SUPPORT_SID_INTERFACE)
362 IMG_SID hSharedPBDesc;
363#else
278 IMG_HANDLE hSharedPBDesc; 364 IMG_HANDLE hSharedPBDesc;
365#endif
279}PVRSRV_BRIDGE_IN_SGXUNREFSHAREDPBDESC; 366}PVRSRV_BRIDGE_IN_SGXUNREFSHAREDPBDESC;
280 367
281typedef struct PVRSRV_BRIDGE_OUT_SGXUNREFSHAREDPBDESC_TAG 368typedef struct PVRSRV_BRIDGE_OUT_SGXUNREFSHAREDPBDESC_TAG
@@ -287,20 +374,34 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXUNREFSHAREDPBDESC_TAG
287typedef struct PVRSRV_BRIDGE_IN_SGXADDSHAREDPBDESC_TAG 374typedef struct PVRSRV_BRIDGE_IN_SGXADDSHAREDPBDESC_TAG
288{ 375{
289 IMG_UINT32 ui32BridgeFlags; 376 IMG_UINT32 ui32BridgeFlags;
377 IMG_UINT32 ui32TotalPBSize;
378#if defined (SUPPORT_SID_INTERFACE)
379 IMG_SID hDevCookie;
380 IMG_SID hSharedPBDescKernelMemInfo;
381 IMG_SID hHWPBDescKernelMemInfo;
382 IMG_SID hBlockKernelMemInfo;
383 IMG_SID hHWBlockKernelMemInfo;
384 IMG_SID *phKernelMemInfoHandles;
385#else
290 IMG_HANDLE hDevCookie; 386 IMG_HANDLE hDevCookie;
291 IMG_HANDLE hSharedPBDescKernelMemInfo; 387 IMG_HANDLE hSharedPBDescKernelMemInfo;
292 IMG_HANDLE hHWPBDescKernelMemInfo; 388 IMG_HANDLE hHWPBDescKernelMemInfo;
293 IMG_HANDLE hBlockKernelMemInfo; 389 IMG_HANDLE hBlockKernelMemInfo;
294 IMG_HANDLE hHWBlockKernelMemInfo; 390 IMG_HANDLE hHWBlockKernelMemInfo;
295 IMG_UINT32 ui32TotalPBSize;
296 IMG_HANDLE *phKernelMemInfoHandles; 391 IMG_HANDLE *phKernelMemInfoHandles;
392#endif
297 IMG_UINT32 ui32KernelMemInfoHandlesCount; 393 IMG_UINT32 ui32KernelMemInfoHandlesCount;
394 IMG_DEV_VIRTADDR sHWPBDescDevVAddr;
298}PVRSRV_BRIDGE_IN_SGXADDSHAREDPBDESC; 395}PVRSRV_BRIDGE_IN_SGXADDSHAREDPBDESC;
299 396
300typedef struct PVRSRV_BRIDGE_OUT_SGXADDSHAREDPBDESC_TAG 397typedef struct PVRSRV_BRIDGE_OUT_SGXADDSHAREDPBDESC_TAG
301{ 398{
302 PVRSRV_ERROR eError; 399 PVRSRV_ERROR eError;
400#if defined (SUPPORT_SID_INTERFACE)
401 IMG_SID hSharedPBDesc;
402#else
303 IMG_HANDLE hSharedPBDesc; 403 IMG_HANDLE hSharedPBDesc;
404#endif
304}PVRSRV_BRIDGE_OUT_SGXADDSHAREDPBDESC; 405}PVRSRV_BRIDGE_OUT_SGXADDSHAREDPBDESC;
305 406
306 407
@@ -316,9 +417,15 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_BUFFER_ARRAY_TAG
316typedef struct PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS_TAG 417typedef struct PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS_TAG
317{ 418{
318 IMG_UINT32 ui32BridgeFlags; 419 IMG_UINT32 ui32BridgeFlags;
420#if defined (SUPPORT_SID_INTERFACE)
421 IMG_SID hDevCookie;
422 IMG_SID hDevMemContext;
423#else
319 IMG_HANDLE hDevCookie; 424 IMG_HANDLE hDevCookie;
425 IMG_HANDLE hDevMemContext;
426#endif
320 IMG_UINT32 ui32DumpFrameNum; 427 IMG_UINT32 ui32DumpFrameNum;
321 IMG_BOOL bLastFrame; 428 IMG_BOOL bLastFrame;
322 IMG_UINT32 *pui32Registers; 429 IMG_UINT32 *pui32Registers;
323 IMG_UINT32 ui32NumRegisters; 430 IMG_UINT32 ui32NumRegisters;
324}PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS; 431}PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS;
@@ -326,7 +433,11 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS_TAG
326typedef struct PVRSRV_BRIDGE_IN_PDUMPCOUNTER_REGISTERS_TAG 433typedef struct PVRSRV_BRIDGE_IN_PDUMPCOUNTER_REGISTERS_TAG
327{ 434{
328 IMG_UINT32 ui32BridgeFlags; 435 IMG_UINT32 ui32BridgeFlags;
436#if defined (SUPPORT_SID_INTERFACE)
437 IMG_SID hDevCookie;
438#else
329 IMG_HANDLE hDevCookie; 439 IMG_HANDLE hDevCookie;
440#endif
330 IMG_UINT32 ui32DumpFrameNum; 441 IMG_UINT32 ui32DumpFrameNum;
331 IMG_BOOL bLastFrame; 442 IMG_BOOL bLastFrame;
332 IMG_UINT32 *pui32Registers; 443 IMG_UINT32 *pui32Registers;
@@ -336,7 +447,11 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMPCOUNTER_REGISTERS_TAG
336typedef struct PVRSRV_BRIDGE_IN_PDUMP_TA_SIGNATURE_REGISTERS_TAG 447typedef struct PVRSRV_BRIDGE_IN_PDUMP_TA_SIGNATURE_REGISTERS_TAG
337{ 448{
338 IMG_UINT32 ui32BridgeFlags; 449 IMG_UINT32 ui32BridgeFlags;
450#if defined (SUPPORT_SID_INTERFACE)
451 IMG_SID hDevCookie;
452#else
339 IMG_HANDLE hDevCookie; 453 IMG_HANDLE hDevCookie;
454#endif
340 IMG_UINT32 ui32DumpFrameNum; 455 IMG_UINT32 ui32DumpFrameNum;
341 IMG_UINT32 ui32TAKickCount; 456 IMG_UINT32 ui32TAKickCount;
342 IMG_BOOL bLastFrame; 457 IMG_BOOL bLastFrame;
@@ -347,7 +462,13 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_TA_SIGNATURE_REGISTERS_TAG
347typedef struct PVRSRV_BRIDGE_IN_PDUMP_HWPERFCB_TAG 462typedef struct PVRSRV_BRIDGE_IN_PDUMP_HWPERFCB_TAG
348{ 463{
349 IMG_UINT32 ui32BridgeFlags; 464 IMG_UINT32 ui32BridgeFlags;
465#if defined (SUPPORT_SID_INTERFACE)
466 IMG_SID hDevCookie;
467 IMG_SID hDevMemContext;
468#else
350 IMG_HANDLE hDevCookie; 469 IMG_HANDLE hDevCookie;
470 IMG_HANDLE hDevMemContext;
471#endif
351 IMG_CHAR szFileName[PVRSRV_PDUMP_MAX_FILENAME_SIZE]; 472 IMG_CHAR szFileName[PVRSRV_PDUMP_MAX_FILENAME_SIZE];
352 IMG_UINT32 ui32FileOffset; 473 IMG_UINT32 ui32FileOffset;
353 IMG_UINT32 ui32PDumpFlags; 474 IMG_UINT32 ui32PDumpFlags;
@@ -357,12 +478,19 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_HWPERFCB_TAG
357typedef struct PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM 478typedef struct PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM
358{ 479{
359 IMG_UINT32 ui32BridgeFlags; 480 IMG_UINT32 ui32BridgeFlags;
481#if defined (SUPPORT_SID_INTERFACE)
482 IMG_SID hDevCookie;
483 IMG_SID hDevMemContext;
484#else
360 IMG_HANDLE hDevCookie; 485 IMG_HANDLE hDevCookie;
486#endif
361 IMG_CHAR szFileName[PVRSRV_PDUMP_MAX_FILENAME_SIZE]; 487 IMG_CHAR szFileName[PVRSRV_PDUMP_MAX_FILENAME_SIZE];
362 IMG_UINT32 ui32FileOffset; 488 IMG_UINT32 ui32FileOffset;
363 IMG_DEV_VIRTADDR sDevVAddr; 489 IMG_DEV_VIRTADDR sDevVAddr;
364 IMG_UINT32 ui32Size; 490 IMG_UINT32 ui32Size;
365 IMG_UINT32 ui32DataMaster; 491#if !defined (SUPPORT_SID_INTERFACE)
492 IMG_HANDLE hDevMemContext;
493#endif
366 IMG_UINT32 ui32PDumpFlags; 494 IMG_UINT32 ui32PDumpFlags;
367 495
368}PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM; 496}PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM;
@@ -372,47 +500,77 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM
372typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_RENDER_CONTEXT_TAG 500typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_RENDER_CONTEXT_TAG
373{ 501{
374 IMG_UINT32 ui32BridgeFlags; 502 IMG_UINT32 ui32BridgeFlags;
503#if defined (SUPPORT_SID_INTERFACE)
504 IMG_SID hDevCookie;
505#else
375 IMG_HANDLE hDevCookie; 506 IMG_HANDLE hDevCookie;
507#endif
376 IMG_DEV_VIRTADDR sHWRenderContextDevVAddr; 508 IMG_DEV_VIRTADDR sHWRenderContextDevVAddr;
377}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_RENDER_CONTEXT; 509}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_RENDER_CONTEXT;
378 510
379typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_RENDER_CONTEXT_TAG 511typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_RENDER_CONTEXT_TAG
380{ 512{
381 PVRSRV_ERROR eError; 513 PVRSRV_ERROR eError;
514#if defined (SUPPORT_SID_INTERFACE)
515 IMG_SID hHWRenderContext;
516#else
382 IMG_HANDLE hHWRenderContext; 517 IMG_HANDLE hHWRenderContext;
518#endif
383}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_RENDER_CONTEXT; 519}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_RENDER_CONTEXT;
384 520
385typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT_TAG 521typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT_TAG
386{ 522{
387 IMG_UINT32 ui32BridgeFlags; 523 IMG_UINT32 ui32BridgeFlags;
524#if defined (SUPPORT_SID_INTERFACE)
525 IMG_SID hDevCookie;
526 IMG_SID hHWRenderContext;
527#else
388 IMG_HANDLE hDevCookie; 528 IMG_HANDLE hDevCookie;
389 IMG_HANDLE hHWRenderContext; 529 IMG_HANDLE hHWRenderContext;
530#endif
390}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT; 531}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT;
391 532
392typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG 533typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG
393{ 534{
394 IMG_UINT32 ui32BridgeFlags; 535 IMG_UINT32 ui32BridgeFlags;
536#if defined (SUPPORT_SID_INTERFACE)
537 IMG_SID hDevCookie;
538#else
395 IMG_HANDLE hDevCookie; 539 IMG_HANDLE hDevCookie;
540#endif
396 IMG_DEV_VIRTADDR sHWTransferContextDevVAddr; 541 IMG_DEV_VIRTADDR sHWTransferContextDevVAddr;
397}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_TRANSFER_CONTEXT; 542}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_TRANSFER_CONTEXT;
398 543
399typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG 544typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG
400{ 545{
401 PVRSRV_ERROR eError; 546 PVRSRV_ERROR eError;
547#if defined (SUPPORT_SID_INTERFACE)
548 IMG_SID hHWTransferContext;
549#else
402 IMG_HANDLE hHWTransferContext; 550 IMG_HANDLE hHWTransferContext;
551#endif
403}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_TRANSFER_CONTEXT; 552}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_TRANSFER_CONTEXT;
404 553
405typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT_TAG 554typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT_TAG
406{ 555{
407 IMG_UINT32 ui32BridgeFlags; 556 IMG_UINT32 ui32BridgeFlags;
557#if defined (SUPPORT_SID_INTERFACE)
558 IMG_SID hDevCookie;
559 IMG_SID hHWTransferContext;
560#else
408 IMG_HANDLE hDevCookie; 561 IMG_HANDLE hDevCookie;
409 IMG_HANDLE hHWTransferContext; 562 IMG_HANDLE hHWTransferContext;
563#endif
410}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT; 564}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT;
411 565
412typedef struct PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET_TAG 566typedef struct PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET_TAG
413{ 567{
414 IMG_UINT32 ui32BridgeFlags; 568 IMG_UINT32 ui32BridgeFlags;
569#if defined (SUPPORT_SID_INTERFACE)
570 IMG_SID hDevCookie;
571#else
415 IMG_HANDLE hDevCookie; 572 IMG_HANDLE hDevCookie;
573#endif
416 IMG_DEV_VIRTADDR sHWRTDataSetDevVAddr; 574 IMG_DEV_VIRTADDR sHWRTDataSetDevVAddr;
417}PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET; 575}PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET;
418 576
@@ -421,21 +579,34 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET_TAG
421typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_2D_CONTEXT_TAG 579typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_2D_CONTEXT_TAG
422{ 580{
423 IMG_UINT32 ui32BridgeFlags; 581 IMG_UINT32 ui32BridgeFlags;
582#if defined (SUPPORT_SID_INTERFACE)
583 IMG_SID hDevCookie;
584#else
424 IMG_HANDLE hDevCookie; 585 IMG_HANDLE hDevCookie;
586#endif
425 IMG_DEV_VIRTADDR sHW2DContextDevVAddr; 587 IMG_DEV_VIRTADDR sHW2DContextDevVAddr;
426}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_2D_CONTEXT; 588}PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_2D_CONTEXT;
427 589
428typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_2D_CONTEXT_TAG 590typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_2D_CONTEXT_TAG
429{ 591{
430 PVRSRV_ERROR eError; 592 PVRSRV_ERROR eError;
593#if defined (SUPPORT_SID_INTERFACE)
594 IMG_SID hHW2DContext;
595#else
431 IMG_HANDLE hHW2DContext; 596 IMG_HANDLE hHW2DContext;
597#endif
432}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_2D_CONTEXT; 598}PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_2D_CONTEXT;
433 599
434typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT_TAG 600typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT_TAG
435{ 601{
436 IMG_UINT32 ui32BridgeFlags; 602 IMG_UINT32 ui32BridgeFlags;
603#if defined (SUPPORT_SID_INTERFACE)
604 IMG_SID hDevCookie;
605 IMG_SID hHW2DContext;
606#else
437 IMG_HANDLE hDevCookie; 607 IMG_HANDLE hDevCookie;
438 IMG_HANDLE hHW2DContext; 608 IMG_HANDLE hHW2DContext;
609#endif
439}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT; 610}PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT;
440 611
441#define SGX2D_MAX_BLT_CMD_SIZ 256 612#define SGX2D_MAX_BLT_CMD_SIZ 256
@@ -445,7 +616,11 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT_TAG
445typedef struct PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB_TAG 616typedef struct PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB_TAG
446{ 617{
447 IMG_UINT32 ui32BridgeFlags; 618 IMG_UINT32 ui32BridgeFlags;
619#if defined (SUPPORT_SID_INTERFACE)
620 IMG_SID hDevCookie;
621#else
448 IMG_HANDLE hDevCookie; 622 IMG_HANDLE hDevCookie;
623#endif
449 IMG_UINT32 ui32ArraySize; 624 IMG_UINT32 ui32ArraySize;
450 PVRSRV_SGX_HWPERF_CB_ENTRY *psHWPerfCBData; 625 PVRSRV_SGX_HWPERF_CB_ENTRY *psHWPerfCBData;
451} PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB; 626} PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB;