gpu: pvr: pdump: remove unused pdump functions

Checked symbols and defines in pdump_km.h, and removed them when unused.
sparse then flagged the unused functions in pdump.c and pdump_common.c

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/dbgdrvif.h b/pvr/dbgdrvif.h
index d8ace97..0e6a110 100644 (file)
--- a/pvr/dbgdrvif.h
+++ b/pvr/dbgdrvif.h
@@ -284,7 +284,7 @@ struct DBGKM_SERVICE_TABLE {
                        u32 ui32DebugLevel);
        void  (*pfnSetFrame)(struct DBG_STREAM *psStream,
                        u32 ui32Frame);
-       u32   (*pfnGetFrame)(struct DBG_STREAM *psStream);
+       u32   (*pfnGetFrame)(struct DBG_STREAM *psStream); /* unused */
        void  (*pfnOverrideMode)(struct DBG_STREAM *psStream,
                        u32 ui32Mode);
        void  (*pfnDefaultMode)(struct DBG_STREAM *psStream);

diff --git a/pvr/pdump.c b/pvr/pdump.c
index 733c208..5c4b5e4 100644 (file)
--- a/pvr/pdump.c
+++ b/pvr/pdump.c
@@ -44,13 +44,10 @@ static IMG_BOOL PDumpWriteString2(char *pszString, u32 ui32Flags);
 static IMG_BOOL PDumpWriteILock(struct DBG_STREAM *psStream, u8 *pui8Data,
                                u32 ui32Count, u32 ui32Flags);
 static void DbgSetFrame(struct DBG_STREAM *psStream, u32 ui32Frame);
-static u32 DbgGetFrame(struct DBG_STREAM *psStream);
 static void DbgSetMarker(struct DBG_STREAM *psStream, u32 ui32Marker);
 static u32 DbgWrite(struct DBG_STREAM *psStream, u8 *pui8Data,
                           u32 ui32BCount, u32 ui32Flags);
 
-#define PDUMP_DATAMASTER_PIXEL                 1
-
 #define MIN(a, b)                              (a > b ? b : a)
 
 #define MAX_FILE_SIZE                          0x40000000
@@ -237,12 +234,6 @@ void PDumpCommentWithFlags(u32 ui32Flags, char *pszFormat, ...)
        PDumpCommentKM(pszMsg, ui32Flags);
 }
 
-IMG_BOOL PDumpIsLastCaptureFrameKM(void)
-{
-       return gpfnDbgDrv->pfnIsLastCaptureFrame(
-                               gsDBGPdumpState.psStream[PDUMP_STREAM_SCRIPT2]);
-}
-
 IMG_BOOL PDumpIsCaptureFrameKM(void)
 {
        if (PDumpSuspended())
@@ -834,14 +825,6 @@ enum PVRSRV_ERROR PDumpSetFrameKM(u32 ui32Frame)
        return PVRSRV_OK;
 }
 
-static enum PVRSRV_ERROR PDumpGetFrameKM(u32 *pui32Frame)
-{
-       *pui32Frame =
-           DbgGetFrame(gsDBGPdumpState.psStream[PDUMP_STREAM_SCRIPT2]);
-
-       return PVRSRV_OK;
-}
-
 enum PVRSRV_ERROR PDumpCommentKM(char *pszComment, u32 ui32Flags)
 {
        u32 ui32Count = 0;
@@ -975,11 +958,6 @@ static void DbgSetFrame(struct DBG_STREAM *psStream, u32 ui32Frame)
        gpfnDbgDrv->pfnSetFrame(psStream, ui32Frame);
 }
 
-static u32 DbgGetFrame(struct DBG_STREAM *psStream)
-{
-       return gpfnDbgDrv->pfnGetFrame(psStream);
-}
-
 static void DbgSetMarker(struct DBG_STREAM *psStream, u32 ui32Marker)
 {
        gpfnDbgDrv->pfnSetMarker(psStream, ui32Marker);
@@ -1019,18 +997,6 @@ static u32 DbgWrite(struct DBG_STREAM *psStream, u8 *pui8Data,
        return ui32BytesWritten;
 }
 
-IMG_BOOL PDumpTestNextFrame(u32 ui32CurrentFrame)
-{
-       IMG_BOOL bFrameDumped;
-
-       bFrameDumped = IMG_FALSE;
-       PDumpSetFrameKM(ui32CurrentFrame + 1);
-       bFrameDumped = PDumpIsCaptureFrameKM();
-       PDumpSetFrameKM(ui32CurrentFrame);
-
-       return bFrameDumped;
-}
-
 void PDump3DSignatureRegisters(u32 ui32DumpFrameNum, IMG_BOOL bLastFrame,
                                   u32 *pui32Registers, u32 ui32NumRegisters)
 {
@@ -1192,11 +1158,6 @@ void PDumpIDLWithFlags(u32 ui32Clocks, u32 ui32Flags)
        PDumpWriteString2(pszScript, ui32Flags);
 }
 
-void PDumpIDL(u32 ui32Clocks)
-{
-       PDumpIDLWithFlags(ui32Clocks, PDUMP_FLAGS_CONTINUOUS);
-}
-
 void PDumpSuspendKM(void)
 {
        atomic_inc(&gsPDumpSuspended);

diff --git a/pvr/pdump_common.c b/pvr/pdump_common.c
index 4f0e6f2..80c795a 100644 (file)
--- a/pvr/pdump_common.c
+++ b/pvr/pdump_common.c
@@ -36,10 +36,9 @@
 #define        PTR_PLUS(t, p, x)       ((t *)(((char *)(p)) + (x)))
 #define        VPTR_PLUS(p, x)         PTR_PLUS(void, p, x)
 #define        VPTR_INC(p, x)          (p = VPTR_PLUS(p, x))
-#define MAX_PDUMP_MMU_CONTEXTS 10
+
 static void *gpvTempBuffer;
 static void *ghTempBufferBlockAlloc;
-static u16 gui16MMUContextUsage;
 
 static void *GetTempBuffer(void)
 {
@@ -144,94 +143,4 @@ enum PVRSRV_ERROR PDumpMemUM(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
        return PVRSRV_OK;
 }
 
-static enum PVRSRV_ERROR _PdumpAllocMMUContext(u32 *pui32MMUContextID)
-{
-       u32 i;
-
-       for (i = 0; i < MAX_PDUMP_MMU_CONTEXTS; i++)
-               if ((gui16MMUContextUsage & (1UL << i)) == 0) {
-                       gui16MMUContextUsage |= 1UL << i;
-                       *pui32MMUContextID = i;
-                       return PVRSRV_OK;
-               }
-
-       PVR_DPF(PVR_DBG_ERROR,
-                "_PdumpAllocMMUContext: no free MMU context ids");
-
-       return PVRSRV_ERROR_GENERIC;
-}
-
-static enum PVRSRV_ERROR _PdumpFreeMMUContext(u32 ui32MMUContextID)
-{
-       if (ui32MMUContextID < MAX_PDUMP_MMU_CONTEXTS) {
-
-               gui16MMUContextUsage &= ~(1UL << ui32MMUContextID);
-               return PVRSRV_OK;
-       }
-
-       PVR_DPF(PVR_DBG_ERROR,
-                "_PdumpFreeMMUContext: MMU context ids invalid");
-
-       return PVRSRV_ERROR_GENERIC;
-}
-
-enum PVRSRV_ERROR PDumpSetMMUContext(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                                    char *pszMemSpace, u32 *pui32MMUContextID,
-                                    u32 ui32MMUType, void *hUniqueTag1,
-                                    void *pvPDCPUAddr)
-{
-       u8 *pui8LinAddr = (u8 *) pvPDCPUAddr;
-       struct IMG_CPU_PHYADDR sCpuPAddr;
-       struct IMG_DEV_PHYADDR sDevPAddr;
-       u32 ui32MMUContextID;
-       enum PVRSRV_ERROR eError;
-
-       eError = _PdumpAllocMMUContext(&ui32MMUContextID);
-       if (eError != PVRSRV_OK) {
-               PVR_DPF(PVR_DBG_ERROR,
-                        "PDumpSetMMUContext: _PdumpAllocMMUContext failed: %d",
-                        eError);
-               return eError;
-       }
-
-       sCpuPAddr = OSMapLinToCPUPhys(pui8LinAddr);
-       sDevPAddr = SysCpuPAddrToDevPAddr(eDeviceType, sCpuPAddr);
-
-       sDevPAddr.uiAddr &= ~PVRSRV_4K_PAGE_SIZE;
-
-       PDumpComment("Set MMU Context\r\n");
-
-       PDumpComment("MMU :%s:v%d %d :%s:PA_%8.8lX%8.8lX\r\n",
-                    pszMemSpace, ui32MMUContextID, ui32MMUType, pszMemSpace,
-                    hUniqueTag1, sDevPAddr.uiAddr);
-
-       *pui32MMUContextID = ui32MMUContextID;
-
-       return PVRSRV_OK;
-}
-
-enum PVRSRV_ERROR PDumpClearMMUContext(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                                      char *pszMemSpace,
-                                      u32 ui32MMUContextID, u32 ui32MMUType)
-{
-       enum PVRSRV_ERROR eError;
-
-       PVR_UNREFERENCED_PARAMETER(eDeviceType);
-
-       PDumpComment("Clear MMU Context\r\n");
-
-       PDumpComment("MMU :%s:v%d %d\r\n",
-                    pszMemSpace, ui32MMUContextID, ui32MMUType);
-
-       eError = _PdumpFreeMMUContext(ui32MMUContextID);
-       if (eError != PVRSRV_OK) {
-               PVR_DPF(PVR_DBG_ERROR,
-                       "PDumpClearMMUContext: _PdumpFreeMMUContext failed: %d",
-                        eError);
-               return eError;
-       }
-
-       return PVRSRV_OK;
-}
-
 #endif

diff --git a/pvr/pdump_km.h b/pvr/pdump_km.h
index 3d9b9a9..78c6585 100644 (file)
--- a/pvr/pdump_km.h
+++ b/pvr/pdump_km.h
@@ -43,8 +43,6 @@
        (((struct BM_BUF *)(((struct PVRSRV_KERNEL_MEM_INFO *)          \
                             hMemInfo)->sMemBlk.hBuffer))->pMapping)
 
-#define PDUMP_REG_FUNC_NAME PDumpReg
-
 enum PVRSRV_ERROR PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO
                                           *psMemInfo, u32 ui32Offset,
                                           u32 ui32Value, u32 ui32Mask,
@@ -65,11 +63,6 @@ enum PVRSRV_ERROR PDumpMemKM(void *pvAltLinAddr,
                struct PVRSRV_KERNEL_MEM_INFO *psMemInfo, u32 ui32Offset,
                u32 ui32Bytes, u32 ui32Flags, void *hUniqueTag);
 
-enum PVRSRV_ERROR PDumpMemPagesKM(enum PVRSRV_DEVICE_TYPE eDeviceType,
-               struct IMG_DEV_PHYADDR *pPages, u32 ui32NumPages,
-               struct IMG_DEV_VIRTADDR sDevAddr, u32 ui32Start,
-               u32 ui32Length, u32 ui32Flags, void *hUniqueTag);
-
 enum PVRSRV_ERROR PDumpMem2KM(enum PVRSRV_DEVICE_TYPE eDeviceType,
                              void *pvLinAddr,
                              u32 ui32Bytes,
@@ -93,20 +86,7 @@ enum PVRSRV_ERROR PDumpBitmapKM(char *pszFileName, u32 ui32FileOffset,
 void PDumpHWPerfCBKM(char *pszFileName, u32 ui32FileOffset,
                struct IMG_DEV_VIRTADDR sDevBaseAddr,
                u32 ui32Size, u32 ui32PDumpFlags);
-void PDUMP_REG_FUNC_NAME(u32 dwReg, u32 dwData);
-
-void PDumpMsvdxRegRead(const char *const pRegRegion, const u32 dwRegOffset);
-
-void PDumpMsvdxRegWrite(const char *const pRegRegion, const u32 dwRegOffset,
-               const u32 dwData);
-
-enum PVRSRV_ERROR PDumpMsvdxRegPol(const char *const pRegRegion,
-               const u32 ui32Offset, const u32 ui32CheckFuncIdExt,
-               const u32 ui32RequValue, const u32 ui32Enable,
-               const u32 ui32PollCount, const u32 ui32TimeOut);
-
-enum PVRSRV_ERROR PDumpMsvdxWriteRef(const char *const pRegRegion,
-               const u32 ui32VLROffset, const u32 ui32Physical);
+void PDumpReg(u32 dwReg, u32 dwData);
 
 void PDumpComment(char *pszFormat, ...);
 
@@ -116,24 +96,13 @@ enum PVRSRV_ERROR PDumpRegPolKM(u32 ui32RegAddr, u32 ui32RegValue,
 enum PVRSRV_ERROR PDumpRegPolWithFlagsKM(u32 ui32RegAddr, u32 ui32RegValue,
                                u32 ui32Mask, u32 ui32Flags);
 
-IMG_BOOL PDumpIsLastCaptureFrameKM(void);
 IMG_BOOL PDumpIsCaptureFrameKM(void);
 
 void PDumpMallocPages(enum PVRSRV_DEVICE_TYPE eDeviceType,
                      u32 ui32DevVAddr, void *pvLinAddr, void *hOSMemHandle,
                      u32 ui32NumBytes, u32 ui32PageSize, void *hUniqueTag);
-void PDumpMallocPagesPhys(enum PVRSRV_DEVICE_TYPE eDeviceType,
-               u32 ui32DevVAddr, u32 *pui32PhysPages, u32 ui32NumPages,
-               void *hUniqueTag);
 void PDumpMallocPageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
                void *pvLinAddr, u32 ui32NumBytes, void *hUniqueTag);
-enum PVRSRV_ERROR PDumpSetMMUContext(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                                    char *pszMemSpace, u32 *pui32MMUContextID,
-                                    u32 ui32MMUType, void *hUniqueTag1,
-                                    void *pvPDCPUAddr);
-enum PVRSRV_ERROR PDumpClearMMUContext(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                                      char *pszMemSpace,
-                                      u32 ui32MMUContextID, u32 ui32MMUType);
 void PDumpFreePages(struct BM_HEAP *psBMHeap,
                struct IMG_DEV_VIRTADDR sDevVAddr, u32 ui32NumBytes,
                 u32 ui32PageSize, void *hUniqueTag, IMG_BOOL bInterleaved);
@@ -147,8 +116,6 @@ enum PVRSRV_ERROR PDumpPDDevPAddrKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                u32 ui32Offset, struct IMG_DEV_PHYADDR sPDDevPAddr,
                void *hUniqueTag1, void *hUniqueTag2);
 
-IMG_BOOL PDumpTestNextFrame(u32 ui32CurrentFrame);
-
 void PDumpTASignatureRegisters(u32 ui32DumpFrameNum,
                u32 ui32TAKickCount, IMG_BOOL bLastFrame,
                u32 *pui32Registers, u32 ui32NumRegisters);
@@ -170,7 +137,6 @@ void PDumpCBP(struct PVRSRV_KERNEL_MEM_INFO *psROffMemInfo,
              u32 ui32BufferSize, u32 ui32Flags, void *hUniqueTag);
 
 void PDumpIDLWithFlags(u32 ui32Clocks, u32 ui32Flags);
-void PDumpIDL(u32 ui32Clocks);
 
 void PDumpSuspendKM(void);
 void PDumpResumeKM(void);
@@ -181,32 +147,19 @@ void PDumpResumeKM(void);
 #define PDUMPMEMUM                             PDumpMemUM
 #define PDUMPINIT                              PDumpInitCommon
 #define PDUMPDEINIT                            PDumpDeInitCommon
-#define PDUMPISLASTFRAME                       PDumpIsLastCaptureFrameKM
-#define PDUMPTESTFRAME                         PDumpIsCaptureFrameKM
-#define PDUMPTESTNEXTFRAME                     PDumpTestNextFrame
 #define PDUMPREGWITHFLAGS                      PDumpRegWithFlagsKM
-#define PDUMPREG                               PDUMP_REG_FUNC_NAME
+#define PDUMPREG                               PDumpReg
 #define PDUMPCOMMENT                           PDumpComment
 #define PDUMPCOMMENTWITHFLAGS                  PDumpCommentWithFlags
 #define PDUMPREGPOL                            PDumpRegPolKM
 #define PDUMPREGPOLWITHFLAGS                   PDumpRegPolWithFlagsKM
 #define PDUMPMALLOCPAGES                       PDumpMallocPages
 #define PDUMPMALLOCPAGETABLE                   PDumpMallocPageTable
-#define PDUMPSETMMUCONTEXT                     PDumpSetMMUContext
-#define PDUMPCLEARMMUCONTEXT                   PDumpClearMMUContext
 #define PDUMPFREEPAGES                         PDumpFreePages
 #define PDUMPFREEPAGETABLE                     PDumpFreePageTable
-#define PDUMPPDREG                             PDumpPDReg
 #define PDUMPPDREGWITHFLAGS                    PDumpPDRegWithFlags
 #define PDUMPCBP                               PDumpCBP
-#define PDUMPMALLOCPAGESPHYS                   PDumpMallocPagesPhys
-#define PDUMPMSVDXREGWRITE                     PDumpMsvdxRegWrite
-#define PDUMPMSVDXREGREAD                      PDumpMsvdxRegRead
-#define PDUMPMSVDXPOL                          PDumpMsvdxRegPol
-#define PDUMPMSVDXWRITEREF                     PDumpMsvdxWriteRef
-#define PDUMPBITMAPKM                          PDumpBitmapKM
 #define PDUMPIDLWITHFLAGS                      PDumpIDLWithFlags
-#define PDUMPIDL                               PDumpIDL
 #define PDUMPSUSPEND                           PDumpSuspendKM
 #define PDUMPRESUME                            PDumpResumeKM
 
@@ -220,39 +173,21 @@ void PDumpResumeKM(void);
 #define PDUMPMEMUM(args...)
 #define PDUMPINIT(args...)
 #define PDUMPDEINIT(args...)
-#define PDUMPISLASTFRAME(args...)
-#define PDUMPTESTFRAME(args...)
-#define PDUMPTESTNEXTFRAME(args...)
 #define PDUMPREGWITHFLAGS(args...)
 #define PDUMPREG(args...)
 #define PDUMPCOMMENT(args...)
+#define PDUMPCOMMENTWITHFLAGS(args...)
 #define PDUMPREGPOL(args...)
 #define PDUMPREGPOLWITHFLAGS(args...)
 #define PDUMPMALLOCPAGES(args...)
 #define PDUMPMALLOCPAGETABLE(args...)
-#define PDUMPSETMMUCONTEXT(args...)
-#define PDUMPCLEARMMUCONTEXT(args...)
 #define PDUMPFREEPAGES(args...)
 #define PDUMPFREEPAGETABLE(args...)
-#define PDUMPPDREG(args...)
 #define PDUMPPDREGWITHFLAGS(args...)
-#define PDUMPSYNC(args...)
-#define PDUMPCOPYTOMEM(args...)
-#define PDUMPWRITE(args...)
 #define PDUMPCBP(args...)
-#define PDUMPCOMMENTWITHFLAGS(args...)
-#define PDUMPMALLOCPAGESPHYS(args...)
-#define PDUMPMSVDXREG(args...)
-#define PDUMPMSVDXREGWRITE(args...)
-#define PDUMPMSVDXREGREAD(args...)
-#define PDUMPMSVDXPOLEQ(args...)
-#define PDUMPMSVDXPOL(args...)
-#define PDUMPBITMAPKM(args...)
 #define PDUMPIDLWITHFLAGS(args...)
-#define PDUMPIDL(args...)
 #define PDUMPSUSPEND(args...)
 #define PDUMPRESUME(args...)
-#define PDUMPMSVDXWRITEREF(args...)
 #endif
 
 #endif