From ccdf6d5d6ca7fd124a78e97954ba234bb5263cb4 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Fri, 1 Apr 2011 18:13:11 +0300 Subject: [PATCH] gpu: pvr: pass proc info to sgxkick and sgxtransfer Needed by the next patch adding tracing to these commands. Signed-off-by: Imre Deak Reviewed-by: Luc Verhaegen --- pvr/bridged_sgx_bridge.c | 6 ++++-- pvr/sgx_bridge_km.h | 6 ++++-- pvr/sgxkick.c | 5 +++-- pvr/sgxtransfer.c | 4 +++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c index f3a24a4..70e698b 100644 --- a/pvr/bridged_sgx_bridge.c +++ b/pvr/bridged_sgx_bridge.c @@ -255,7 +255,8 @@ int SGXDoKickBW(u32 ui32BridgeID, return 0; } - psRetOUT->eError = SGXDoKickKM(hDevCookieInt, &psDoKickIN->sCCBKick); + psRetOUT->eError = SGXDoKickKM(hDevCookieInt, &psDoKickIN->sCCBKick, + psPerProc); return 0; } @@ -357,7 +358,8 @@ int SGXSubmitTransferBW(u32 ui32BridgeID, return 0; } - psRetOUT->eError = SGXSubmitTransferKM(hDevCookieInt, psKick); + psRetOUT->eError = SGXSubmitTransferKM(hDevCookieInt, psKick, + psPerProc); return 0; } diff --git a/pvr/sgx_bridge_km.h b/pvr/sgx_bridge_km.h index fbd3379..f0613e7 100644 --- a/pvr/sgx_bridge_km.h +++ b/pvr/sgx_bridge_km.h @@ -36,11 +36,13 @@ enum PVRSRV_ERROR SGXSubmitTransferKM(void *hDevHandle, - struct PVRSRV_TRANSFER_SGX_KICK *psKick); + struct PVRSRV_TRANSFER_SGX_KICK *psKick, + struct PVRSRV_PER_PROCESS_DATA *proc); enum PVRSRV_ERROR SGXDoKickKM(void *hDevHandle, - struct SGX_CCB_KICK *psCCBKick); + struct SGX_CCB_KICK *psCCBKick, + struct PVRSRV_PER_PROCESS_DATA *proc); enum PVRSRV_ERROR SGXGetPhysPageAddrKM(void *hDevMemHeap, struct IMG_DEV_VIRTADDR sDevVAddr, diff --git a/pvr/sgxkick.c b/pvr/sgxkick.c index 6678b49..ef4154b 100644 --- a/pvr/sgxkick.c +++ b/pvr/sgxkick.c @@ -36,9 +36,10 @@ #include "osfunc.h" #include "pvr_debug.h" #include "sgxutils.h" +#include "perproc.h" -enum PVRSRV_ERROR SGXDoKickKM(void *hDevHandle, - struct SGX_CCB_KICK *psCCBKick) +enum PVRSRV_ERROR SGXDoKickKM(void *hDevHandle, struct SGX_CCB_KICK *psCCBKick, + struct PVRSRV_PER_PROCESS_DATA *proc) { enum PVRSRV_ERROR eError; struct PVRSRV_KERNEL_SYNC_INFO *psSyncInfo; diff --git a/pvr/sgxtransfer.c b/pvr/sgxtransfer.c index 22d2ac8..0890921 100644 --- a/pvr/sgxtransfer.c +++ b/pvr/sgxtransfer.c @@ -40,9 +40,11 @@ #include "osfunc.h" #include "pvr_debug.h" #include "sgxutils.h" +#include "perproc.h" enum PVRSRV_ERROR SGXSubmitTransferKM(void *hDevHandle, - struct PVRSRV_TRANSFER_SGX_KICK *psKick) + struct PVRSRV_TRANSFER_SGX_KICK *psKick, + struct PVRSRV_PER_PROCESS_DATA *proc) { struct PVRSRV_KERNEL_MEM_INFO *psCCBMemInfo = (struct PVRSRV_KERNEL_MEM_INFO *)psKick->hCCBMemInfo; -- 2.39.5