gpu: pvr: pdump: remove lastframe support

Userspace does not use this, so no functional change.

Signed-off-by: Luc Verhaegen <Luc.Verhaegen@basyskom.de>
Signed-off-by: Imre Deak <imre.deak@nokia.com>

diff --git a/pvr/bridged_pvr_bridge.c b/pvr/bridged_pvr_bridge.c
index 139adb9..5da331e 100644 (file)
--- a/pvr/bridged_pvr_bridge.c
+++ b/pvr/bridged_pvr_bridge.c
@@ -1132,8 +1132,6 @@ static int PDumpMemPolBW(u32 ui32BridgeID,
                          psPDumpMemPolIN->ui32Value,
                          psPDumpMemPolIN->ui32Mask,
                          PDUMP_POLL_OPERATOR_EQUAL,
-                         psPDumpMemPolIN->bLastFrame,
-                         psPDumpMemPolIN->bOverwrite,
                          MAKEUNIQUETAG(pvMemInfo));
 
        return 0;
@@ -1244,7 +1242,6 @@ static int PDumpSyncPolBW(u32 ui32BridgeID,
                          psSyncDataMemInfoKM, ui32Offset,
                          psPDumpSyncPolIN->ui32Value,
                          psPDumpSyncPolIN->ui32Mask, PDUMP_POLL_OPERATOR_EQUAL,
-                         IMG_FALSE, IMG_FALSE,
                          MAKEUNIQUETAG(((struct PVRSRV_KERNEL_SYNC_INFO *)
                                          pvSyncInfo)->psSyncDataMemInfoKM));
 
@@ -1276,8 +1273,7 @@ static int PDumpCycleCountRegReadBW(u32 ui32BridgeID,
                                 PVRSRV_BRIDGE_PDUMP_CYCLE_COUNT_REG_READ);
        PVR_UNREFERENCED_PARAMETER(psPerProc);
 
-       PDumpCycleCountRegRead(psPDumpCycleCountRegReadIN->ui32RegOffset,
-                              psPDumpCycleCountRegReadIN->bLastFrame);
+       PDumpCycleCountRegRead(psPDumpCycleCountRegReadIN->ui32RegOffset);
 
        psRetOUT->eError = PVRSRV_OK;
 

diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index f31adb6..3a1aaec 100644 (file)
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -1501,7 +1501,6 @@ static void DumpBufferArray(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
                                PDUMPMEMPOL(psCtrlMemInfoKM, ui32Offset,
                                            0, 0xFFFFFFFF,
                                            PDUMP_POLL_OPERATOR_NOTEQUAL,
-                                           IMG_FALSE, IMG_FALSE,
                                            MAKEUNIQUETAG(psCtrlMemInfoKM));
 
                                PDUMPCOMMENTWITHFLAGS(0,
@@ -1615,7 +1614,6 @@ int SGXPDump3DSignatureRegistersBW(u32 ui32BridgeID,
 
        PDump3DSignatureRegisters(psPDump3DSignatureRegistersIN->
                                                          ui32DumpFrameNum,
-                                 psPDump3DSignatureRegistersIN->bLastFrame,
                                  pui32Registers,
                                  psPDump3DSignatureRegistersIN->
                                                          ui32NumRegisters);
@@ -1665,7 +1663,6 @@ int SGXPDumpCounterRegistersBW(u32 ui32BridgeID,
        }
 
        PDumpCounterRegisters(psPDumpCounterRegistersIN->ui32DumpFrameNum,
-                             psPDumpCounterRegistersIN->bLastFrame,
                              pui32Registers,
                              psPDumpCounterRegistersIN->ui32NumRegisters);
 
@@ -1718,7 +1715,6 @@ int SGXPDumpTASignatureRegistersBW(u32 ui32BridgeID,
                                                          ui32DumpFrameNum,
                                  psPDumpTASignatureRegistersIN->
                                                          ui32TAKickCount,
-                                 psPDumpTASignatureRegistersIN->bLastFrame,
                                  pui32Registers,
                                  psPDumpTASignatureRegistersIN->
                                                          ui32NumRegisters);

diff --git a/pvr/pdump.c b/pvr/pdump.c
index 5c4b5e4..f72e344 100644 (file)
--- a/pvr/pdump.c
+++ b/pvr/pdump.c
@@ -474,7 +474,6 @@ void PDumpPDRegWithFlags(u32 ui32Reg, u32 ui32Data, u32 ui32Flags,
 enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                           u32 ui32Offset, u32 ui32Value, u32 ui32Mask,
                           enum PDUMP_POLL_OPERATOR eOperator,
-                          IMG_BOOL bLastFrame, IMG_BOOL bOverwrite,
                           void *hUniqueTag)
 {
 #define MEMPOLL_DELAY          (1000)
@@ -484,7 +483,6 @@ enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
        struct IMG_DEV_PHYADDR sDevPAddr;
        struct IMG_DEV_VIRTADDR sDevVPageAddr;
        struct IMG_CPU_PHYADDR CpuPAddr;
-       u32 ui32Flags;
        __PDBG_PDUMP_STATE_GET_SCRIPT_AND_FILE_STRING(PVRSRV_ERROR_GENERIC);
 
        PVR_ASSERT((ui32Offset + sizeof(u32)) <=
@@ -496,14 +494,6 @@ enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                snprintf(pszFile, SZ_FILENAME_SIZE_MAX, "%%0%%%u.prm",
                         gsDBGPdumpState.ui32ParamFileNum);
 
-       ui32Flags = 0;
-
-       if (bLastFrame)
-               ui32Flags |= PDUMP_FLAGS_LASTFRAME;
-
-       if (bOverwrite)
-               ui32Flags |= PDUMP_FLAGS_RESETLFBUFFER;
-
        CpuPAddr =
            OSMemHandleToCpuPAddr(psMemInfo->sMemBlk.hOSMemHandle, ui32Offset);
        ui32PageOffset = CpuPAddr.uiAddr & (PAGE_SIZE - 1);
@@ -521,7 +511,7 @@ enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                 (u32)hUniqueTag, sDevPAddr.uiAddr & ~(SGX_MMU_PAGE_SIZE - 1),
                 sDevPAddr.uiAddr & (SGX_MMU_PAGE_SIZE - 1),
                 ui32Value, ui32Mask, eOperator, MEMPOLL_COUNT, MEMPOLL_DELAY);
-       PDumpWriteString2(pszScript, ui32Flags);
+       PDumpWriteString2(pszScript, 0);
 
        return PVRSRV_OK;
 }
@@ -978,92 +968,76 @@ static u32 DbgWrite(struct DBG_STREAM *psStream, u8 *pui8Data,
                        ui32BytesWritten =
                            gpfnDbgDrv->pfnDBGDrivWrite2(psStream, pui8Data,
                                                         ui32BCount, 1);
-       } else if (ui32Flags & PDUMP_FLAGS_LASTFRAME) {
-               u32 ui32DbgFlags;
-
-               ui32DbgFlags = 0;
-               if (ui32Flags & PDUMP_FLAGS_RESETLFBUFFER)
-                       ui32DbgFlags |= WRITELF_FLAGS_RESETBUF;
-
-               ui32BytesWritten =
-                   gpfnDbgDrv->pfnWriteLF(psStream, pui8Data,
-                                                  ui32BCount, 1, ui32DbgFlags);
        } else {
-                       ui32BytesWritten =
-                           gpfnDbgDrv->pfnWriteBINCM(psStream, pui8Data,
-                                                     ui32BCount, 1);
+               ui32BytesWritten =
+                       gpfnDbgDrv->pfnWriteBINCM(psStream, pui8Data,
+                                                 ui32BCount, 1);
        }
 
        return ui32BytesWritten;
 }
 
-void PDump3DSignatureRegisters(u32 ui32DumpFrameNum, IMG_BOOL bLastFrame,
-                                  u32 *pui32Registers, u32 ui32NumRegisters)
+void PDump3DSignatureRegisters(u32 ui32DumpFrameNum,
+                              u32 *pui32Registers, u32 ui32NumRegisters)
 {
-       u32 ui32FileOffset, ui32Flags;
+       u32 ui32FileOffset;
        u32 i;
 
        __PDBG_PDUMP_STATE_GET_SCRIPT_AND_FILE_STRING();
 
-       ui32Flags = bLastFrame ? PDUMP_FLAGS_LASTFRAME : 0;
        ui32FileOffset = 0;
 
-       PDUMPCOMMENTWITHFLAGS(ui32Flags,
-                             "\r\n-- Dump 3D signature registers\r\n");
+       PDUMPCOMMENTWITHFLAGS(0, "\r\n-- Dump 3D signature registers\r\n");
        snprintf(pszFile, SZ_FILENAME_SIZE_MAX, "out%u_3d.sig",
                 ui32DumpFrameNum);
 
        for (i = 0; i < ui32NumRegisters; i++) {
                PDumpReadRegKM(pszFile, ui32FileOffset, pui32Registers[i],
-                              sizeof(u32), ui32Flags);
+                              sizeof(u32), 0);
                ui32FileOffset += sizeof(u32);
        }
 }
 
 static void PDumpCountRead(char *pszFileName, u32 ui32Address, u32 ui32Size,
-                          u32 *pui32FileOffset, IMG_BOOL bLastFrame)
+                          u32 *pui32FileOffset)
 {
        __PDBG_PDUMP_STATE_GET_SCRIPT_STRING();
 
        snprintf(pszScript, SZ_SCRIPT_SIZE_MAX,
                 "SAB :SGXREG:0x%08X 0x%08X %s\r\n", ui32Address,
                 *pui32FileOffset, pszFileName);
-       PDumpWriteString2(pszScript, bLastFrame ? PDUMP_FLAGS_LASTFRAME : 0);
+       PDumpWriteString2(pszScript, 0);
 
        *pui32FileOffset += ui32Size;
 }
 
-void PDumpCounterRegisters(u32 ui32DumpFrameNum, IMG_BOOL bLastFrame,
-                              u32 *pui32Registers, u32 ui32NumRegisters)
+void PDumpCounterRegisters(u32 ui32DumpFrameNum,
+                          u32 *pui32Registers, u32 ui32NumRegisters)
 {
        u32 ui32FileOffset;
        u32 i;
 
        __PDBG_PDUMP_STATE_GET_SCRIPT_AND_FILE_STRING();
 
-       PDUMPCOMMENTWITHFLAGS(bLastFrame ? PDUMP_FLAGS_LASTFRAME : 0,
-                             "\r\n-- Dump counter registers\r\n");
+       PDUMPCOMMENTWITHFLAGS(0, "\r\n-- Dump counter registers\r\n");
        snprintf(pszFile, SZ_FILENAME_SIZE_MAX, "out%u.perf",
                 ui32DumpFrameNum);
        ui32FileOffset = 0;
 
        for (i = 0; i < ui32NumRegisters; i++)
                PDumpCountRead(pszFile, pui32Registers[i], sizeof(u32),
-                              &ui32FileOffset, bLastFrame);
+                              &ui32FileOffset);
 }
 
 void PDumpTASignatureRegisters(u32 ui32DumpFrameNum, u32 ui32TAKickCount,
-                                  IMG_BOOL bLastFrame, u32 *pui32Registers,
-                                  u32 ui32NumRegisters)
+                              u32 *pui32Registers, u32 ui32NumRegisters)
 {
-       u32 ui32FileOffset, ui32Flags;
+       u32 ui32FileOffset;
        u32 i;
 
        __PDBG_PDUMP_STATE_GET_SCRIPT_AND_FILE_STRING();
 
-       ui32Flags = bLastFrame ? PDUMP_FLAGS_LASTFRAME : 0;
-       PDUMPCOMMENTWITHFLAGS(ui32Flags,
-                             "\r\n-- Dump TA signature registers\r\n");
+       PDUMPCOMMENTWITHFLAGS(0, "\r\n-- Dump TA signature registers\r\n");
        snprintf(pszFile, SZ_FILENAME_SIZE_MAX, "out%u_ta.sig",
                 ui32DumpFrameNum);
 
@@ -1071,7 +1045,7 @@ void PDumpTASignatureRegisters(u32 ui32DumpFrameNum, u32 ui32TAKickCount,
 
        for (i = 0; i < ui32NumRegisters; i++) {
                PDumpReadRegKM(pszFile, ui32FileOffset, pui32Registers[i],
-                              sizeof(u32), ui32Flags);
+                              sizeof(u32), 0);
                ui32FileOffset += sizeof(u32);
        }
 }
@@ -1085,13 +1059,13 @@ void PDumpRegRead(const u32 ui32RegOffset, u32 ui32Flags)
        PDumpWriteString2(pszScript, ui32Flags);
 }
 
-void PDumpCycleCountRegRead(const u32 ui32RegOffset, IMG_BOOL bLastFrame)
+void PDumpCycleCountRegRead(const u32 ui32RegOffset)
 {
        __PDBG_PDUMP_STATE_GET_SCRIPT_STRING();
 
        snprintf(pszScript, SZ_SCRIPT_SIZE_MAX, "RDW :SGXREG:0x%X\r\n",
                 ui32RegOffset);
-       PDumpWriteString2(pszScript, bLastFrame ? PDUMP_FLAGS_LASTFRAME : 0);
+       PDumpWriteString2(pszScript, 0);
 }
 
 void PDumpHWPerfCBKM(char *pszFileName, u32 ui32FileOffset,

diff --git a/pvr/pdump_km.h b/pvr/pdump_km.h
index 78c6585..5d22fb7 100644 (file)
--- a/pvr/pdump_km.h
+++ b/pvr/pdump_km.h
@@ -47,8 +47,6 @@ enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO
                                           *psMemInfo, u32 ui32Offset,
                                           u32 ui32Value, u32 ui32Mask,
                                           enum PDUMP_POLL_OPERATOR eOperator,
-                                          IMG_BOOL bLastFrame,
-                                          IMG_BOOL bOverwrite,
                                           void *hUniqueTag);
 
 enum PVRSRV_ERROR PDumpMemUM(struct PVRSRV_PER_PROCESS_DATA
@@ -116,19 +114,18 @@ enum PVRSRV_ERROR PDumpPDDevPAddrKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                u32 ui32Offset, struct IMG_DEV_PHYADDR sPDDevPAddr,
                void *hUniqueTag1, void *hUniqueTag2);
 
-void PDumpTASignatureRegisters(u32 ui32DumpFrameNum,
-               u32 ui32TAKickCount, IMG_BOOL bLastFrame,
-               u32 *pui32Registers, u32 ui32NumRegisters);
+void PDumpTASignatureRegisters(u32 ui32DumpFrameNum, u32 ui32TAKickCount,
+                              u32 *pui32Registers, u32 ui32NumRegisters);
 
-void PDump3DSignatureRegisters(u32 ui32DumpFrameNum, IMG_BOOL bLastFrame,
-               u32 *pui32Registers, u32 ui32NumRegisters);
+void PDump3DSignatureRegisters(u32 ui32DumpFrameNum,
+                              u32 *pui32Registers, u32 ui32NumRegisters);
 
 void PDumpRegRead(const u32 dwRegOffset, u32 ui32Flags);
 
-void PDumpCycleCountRegRead(const u32 dwRegOffset, IMG_BOOL bLastFrame);
+void PDumpCycleCountRegRead(const u32 dwRegOffset);
 
-void PDumpCounterRegisters(u32 ui32DumpFrameNum, IMG_BOOL bLastFrame,
-               u32 *pui32Registers, u32 ui32NumRegisters);
+void PDumpCounterRegisters(u32 ui32DumpFrameNum,
+                          u32 *pui32Registers, u32 ui32NumRegisters);
 
 void PDumpCBP(struct PVRSRV_KERNEL_MEM_INFO *psROffMemInfo,
              u32 ui32ROffOffset,

diff --git a/pvr/sgxpower.c b/pvr/sgxpower.c
index 899613f..551b1a2 100644 (file)
--- a/pvr/sgxpower.c
+++ b/pvr/sgxpower.c
@@ -309,7 +309,7 @@ static enum PVRSRV_ERROR SGXPrePowerState(void *hDevHandle,
                PDUMPMEMPOL(psDevInfo->psKernelSGXHostCtlMemInfo,
                            offsetof(struct SGXMKIF_HOST_CTL, ui32PowerStatus),
                            ui32CompleteStatus, ui32CompleteStatus,
-                           PDUMP_POLL_OPERATOR_EQUAL, IMG_FALSE, IMG_FALSE,
+                           PDUMP_POLL_OPERATOR_EQUAL,
                            MAKEUNIQUETAG(psDevInfo->
                                          psKernelSGXHostCtlMemInfo));
 #endif

diff --git a/pvr/sgxutils.c b/pvr/sgxutils.c
index 2e97811..05973df 100644 (file)
--- a/pvr/sgxutils.c
+++ b/pvr/sgxutils.c
@@ -175,7 +175,7 @@ enum PVRSRV_ERROR SGXScheduleCCBCommand(struct PVRSRV_SGXDEV_INFO *psDevInfo,
                PDUMPMEMPOL(psKernelCCB->psCCBCtlMemInfo,
                            offsetof(struct PVRSRV_SGX_CCB_CTL, ui32ReadOffset),
                            (psKernelCCB->ui32CCBDumpWOff + 1) & 0xff, 0xff,
-                           PDUMP_POLL_OPERATOR_NOTEQUAL, IMG_FALSE, IMG_FALSE,
+                           PDUMP_POLL_OPERATOR_NOTEQUAL,
                            MAKEUNIQUETAG(psKernelCCB->psCCBCtlMemInfo));
 
                PDUMPCOMMENTWITHFLAGS(0, "Kernel CCB command\r\n");
@@ -444,8 +444,7 @@ void SGXCleanupRequest(struct PVRSRV_DEVICE_NODE *psDeviceNode,
                            offsetof(struct SGXMKIF_HOST_CTL, ui32ResManFlags),
                            PVRSRV_USSE_EDM_RESMAN_CLEANUP_COMPLETE,
                            PVRSRV_USSE_EDM_RESMAN_CLEANUP_COMPLETE,
-                           PDUMP_POLL_OPERATOR_EQUAL, IMG_FALSE, IMG_FALSE,
-                           hUniqueTag);
+                           PDUMP_POLL_OPERATOR_EQUAL, hUniqueTag);
 #endif
 
                l = readl(&psSGXHostCtl->ui32ResManFlags);