IMG_BOOL bLookupFailed = IMG_FALSE;
IMG_BOOL bReleaseFailed = IMG_FALSE;
void *hDummy;
+ void **edm_mi;
u32 i;
PVRSRV_BRIDGE_ASSERT_CMD(ui32BridgeID, PVRSRV_BRIDGE_SGX_DEVINITPART2);
PVRSRV_HANDLE_TYPE_MEM_INFO);
bLookupFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
-#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
- eError = PVRSRVLookupHandle(psPerProc->psHandleBase, &hDummy,
- psSGXDevInitPart2IN->sInitInfo.
- hKernelEDMStatusBufferMemInfo,
- PVRSRV_HANDLE_TYPE_MEM_INFO);
- bLookupFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
-#endif
+ edm_mi = &psSGXDevInitPart2IN->sInitInfo.hKernelEDMStatusBufferMemInfo;
+ if (*edm_mi) {
+ eError = PVRSRVLookupHandle(psPerProc->psHandleBase, &hDummy,
+ *edm_mi, PVRSRV_HANDLE_TYPE_MEM_INFO);
+ bLookupFailed |= eError != PVRSRV_OK;
+ }
for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
void *hHandle =
PVRSRV_HANDLE_TYPE_MEM_INFO);
bReleaseFailed |= (IMG_BOOL)(eError != PVRSRV_OK);
-#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
- eError = PVRSRVLookupAndReleaseHandle(psPerProc->psHandleBase,
- &psSGXDevInitPart2IN->sInitInfo.
- hKernelEDMStatusBufferMemInfo,
- psSGXDevInitPart2IN->sInitInfo.
- hKernelEDMStatusBufferMemInfo,
+ if (*edm_mi) {
+ eError = PVRSRVLookupAndReleaseHandle(psPerProc->psHandleBase,
+ edm_mi, *edm_mi,
PVRSRV_HANDLE_TYPE_MEM_INFO);
- bReleaseFailed |= (IMG_BOOL)(eError != PVRSRV_OK);
-#endif
+ bReleaseFailed |= eError != PVRSRV_OK;
+ }
for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
void **phHandle =
hKernelHWPerfCBMemInfo);
bDissociateFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
-#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
- eError = PVRSRVDissociateDeviceMemKM(hDevCookieInt,
- psSGXDevInitPart2IN->sInitInfo.
- hKernelEDMStatusBufferMemInfo);
- bDissociateFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
-#endif
+ if (*edm_mi) {
+ eError = PVRSRVDissociateDeviceMemKM(hDevCookieInt, *edm_mi);
+ bDissociateFailed |= eError != PVRSRV_OK;
+ }
for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
void *hHandle =
u32 ui32HostKickAddress;
u32 ui32GetMiscInfoAddress;
void *hKernelHWPerfCBMemInfo;
-#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
void *hKernelEDMStatusBufferMemInfo;
-#endif
u32 ui32EDMTaskReg0;
u32 ui32EDMTaskReg1;
u32 ui32HWPerfFlags;
-#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
/* !< See SGXMK_STATUS_BUFFER */
struct IMG_DEV_VIRTADDR sEDMStatusBuffer;
-#endif
/*< to count time wraps in the Timer task */
u32 ui32TimeWraps;
psDevInfo->psKernelHWPerfCBMemInfo =
(struct PVRSRV_KERNEL_MEM_INFO *)psInitInfo->hKernelHWPerfCBMemInfo;
-#ifdef PVRSRV_USSE_EDM_STATUS_DEBUG
psDevInfo->psKernelEDMStatusBufferMemInfo =
- (struct PVRSRV_KERNEL_MEM_INFO *)psInitInfo->
- hKernelEDMStatusBufferMemInfo;
-#endif
+ psInitInfo->hKernelEDMStatusBufferMemInfo;
eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
sizeof(struct PVRSRV_SGX_CCB_INFO),