gpu: pvr: pdump: remove unused arguments

The eDeviceType passed to SysCpuPAddrToDevPAddr is not used by
SysCpuPAddrToDevPAddr at all. So stop passing eDeviceType to pdump
functions.

In the other cases, hUniqueTag is very unique indeed.

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 2ce50ce..1028b76 100644 (file)
--- a/pvr/bridged_pvr_bridge.c
+++ b/pvr/bridged_pvr_bridge.c
@@ -1264,7 +1264,7 @@ static int PDumpPDRegBW(u32 ui32BridgeID,
        PVR_UNREFERENCED_PARAMETER(psPerProc);
 
        PDumpPDReg(psPDumpPDRegDumpIN->sHWReg.ui32RegAddr,
-                  psPDumpPDRegDumpIN->sHWReg.ui32RegVal, PDUMP_PD_UNIQUETAG);
+                  psPDumpPDRegDumpIN->sHWReg.ui32RegVal);
 
        psRetOUT->eError = PVRSRV_OK;
        return 0;

diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index a6afdb7..f3a24a4 100644 (file)
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -1465,7 +1465,7 @@ static void DumpBufferArray(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
                                PDUMPCBP(psCtrlMemInfoKM, ui32Offset,
                                         psBuffer->ui32Start,
                                         psBuffer->ui32SpaceUsed,
-                                        psBuffer->ui32BufferSize, 0,
+                                        psBuffer->ui32BufferSize,
                                         MAKEUNIQUETAG(psCtrlMemInfoKM));
                        }
 
@@ -1485,7 +1485,7 @@ static void DumpBufferArray(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
                                PDUMPCBP(psCtrlMemInfoKM, ui32Offset,
                                         psBuffer->ui32Start,
                                         psBuffer->ui32BackEndLength,
-                                        psBuffer->ui32BufferSize, 0,
+                                        psBuffer->ui32BufferSize,
                                         MAKEUNIQUETAG(psCtrlMemInfoKM));
                        }
                        PDUMPCOMMENTWITHFLAGS(0, "%s (part 1)\r\n", pszName);
@@ -1506,7 +1506,7 @@ static void DumpBufferArray(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
                                                      pszName);
                                PDUMPCBP(psCtrlMemInfoKM, ui32Offset, 0,
                                         psBuffer->ui32End,
-                                        psBuffer->ui32BufferSize, 0,
+                                        psBuffer->ui32BufferSize,
                                         MAKEUNIQUETAG(psCtrlMemInfoKM));
                        }
                        PDUMPCOMMENTWITHFLAGS(0, "%s (part 2)\r\n", pszName);

diff --git a/pvr/buffer_manager.c b/pvr/buffer_manager.c
index 535f3ae..6c4023e 100644 (file)
--- a/pvr/buffer_manager.c
+++ b/pvr/buffer_manager.c
@@ -1110,8 +1110,7 @@ static IMG_BOOL DevMemoryAlloc(struct BM_CONTEXT *pBMContext,
                        ui32PDumpSize =
                                pMapping->pBMHeap->sDevArena.ui32DataPageSize;
 
-               PDUMPMALLOCPAGES(psDeviceNode->sDevId.eDeviceType,
-                                pMapping->DevVAddr.uiAddr, pMapping->CpuVAddr,
+               PDUMPMALLOCPAGES(pMapping->DevVAddr.uiAddr,
                                 pMapping->hOSMemHandle, ui32PDumpSize,
                                 (void *)pMapping);
        }

diff --git a/pvr/mmu.c b/pvr/mmu.c
index 2311626..1c70c20 100644 (file)
--- a/pvr/mmu.c
+++ b/pvr/mmu.c
@@ -142,9 +142,7 @@ static void _DeferredFreePageTable(struct MMU_HEAP *pMMUHeap, u32 ui32PTIndex)
                     pMMUHeap->ui32PTPageCount);
        if (ppsPTInfoList[ui32PTIndex]
            && ppsPTInfoList[ui32PTIndex]->PTPageCpuVAddr)
-               PDUMPFREEPAGETABLE(PVRSRV_DEVICE_TYPE_SGX,
-                                  ppsPTInfoList[ui32PTIndex]->PTPageCpuVAddr,
-                                  PDUMP_PT_UNIQUETAG);
+               PDUMPFREEPAGETABLE(ppsPTInfoList[ui32PTIndex]->PTPageCpuVAddr);
 
        switch (pMMUHeap->psDevArena->DevMemHeapType) {
        case DEVICE_MEMORY_HEAP_SHARED:
@@ -159,10 +157,8 @@ static void _DeferredFreePageTable(struct MMU_HEAP *pMMUHeap, u32 ui32PTIndex)
                                    (u32 *) psMMUContext->pvPDCpuVAddr;
                                pui32PDEntry += ui32PDIndex;
                                pui32PDEntry[ui32PTIndex] = 0;
-                               PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                         (void *) &
-                                         pui32PDEntry[ui32PTIndex],
-                                         sizeof(u32), 0, IMG_FALSE,
+                               PDUMPMEM2((void *) &pui32PDEntry[ui32PTIndex],
+                                         sizeof(u32), IMG_FALSE,
                                          PDUMP_PT_UNIQUETAG,
                                          PDUMP_PT_UNIQUETAG);
                                psMMUContext = psMMUContext->psNext;
@@ -177,9 +173,8 @@ static void _DeferredFreePageTable(struct MMU_HEAP *pMMUHeap, u32 ui32PTIndex)
                            (u32 *) pMMUHeap->psMMUContext->pvPDCpuVAddr;
                        pui32PDEntry += ui32PDIndex;
                        pui32PDEntry[ui32PTIndex] = 0;
-                       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                 (void *) &pui32PDEntry[ui32PTIndex],
-                                 sizeof(u32), 0, IMG_FALSE,
+                       PDUMPMEM2((void *) &pui32PDEntry[ui32PTIndex],
+                                 sizeof(u32), IMG_FALSE,
                                  PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG);
                        break;
                }
@@ -398,13 +393,11 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap,
                        OSMemSet(ppsPTInfoList[i]->PTPageCpuVAddr, 0,
                                 SGX_MMU_PAGE_SIZE);
 
-                       PDUMPMALLOCPAGETABLE(PVRSRV_DEVICE_TYPE_SGX,
-                                            ppsPTInfoList[i]->PTPageCpuVAddr,
+                       PDUMPMALLOCPAGETABLE(ppsPTInfoList[i]->PTPageCpuVAddr,
                                             PDUMP_PT_UNIQUETAG);
 
-                       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                 ppsPTInfoList[i]->PTPageCpuVAddr,
-                                 SGX_MMU_PAGE_SIZE, 0, IMG_TRUE,
+                       PDUMPMEM2(ppsPTInfoList[i]->PTPageCpuVAddr,
+                                 SGX_MMU_PAGE_SIZE, IMG_TRUE,
                                  PDUMP_PT_UNIQUETAG, PDUMP_PT_UNIQUETAG);
 
                        switch (pMMUHeap->psDevArena->DevMemHeapType) {
@@ -427,10 +420,8 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap,
                                                        SGX_MMU_PDE_VALID;
 
                                                PDUMPMEM2
-                                                   (PVRSRV_DEVICE_TYPE_SGX,
-                                                    (void *)&pui32PDEntry[i],
-                                                    sizeof(u32), 0,
-                                                    IMG_FALSE,
+                                                   ((void *)&pui32PDEntry[i],
+                                                    sizeof(u32), IMG_FALSE,
                                                     PDUMP_PD_UNIQUETAG,
                                                     PDUMP_PT_UNIQUETAG);
 
@@ -445,10 +436,9 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap,
                                        pui32PDEntry[i] = sDevPAddr.uiAddr |
                                                             SGX_MMU_PDE_VALID;
 
-                                       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                                 (void *)&pui32PDEntry[i],
-                                                 sizeof(u32), 0,
-                                                 IMG_FALSE, PDUMP_PD_UNIQUETAG,
+                                       PDUMPMEM2((void *)&pui32PDEntry[i],
+                                                 sizeof(u32), IMG_FALSE,
+                                                 PDUMP_PD_UNIQUETAG,
                                                  PDUMP_PT_UNIQUETAG);
 
                                        break;
@@ -553,8 +543,7 @@ enum PVRSRV_ERROR MMU_Initialise(struct PVRSRV_DEVICE_NODE *psDeviceNode,
 
        PDUMPCOMMENT("Alloc page directory");
 
-       PDUMPMALLOCPAGETABLE(PVRSRV_DEVICE_TYPE_SGX, pvPDCpuVAddr,
-                            PDUMP_PD_UNIQUETAG);
+       PDUMPMALLOCPAGETABLE(pvPDCpuVAddr, PDUMP_PD_UNIQUETAG);
 
        if (pvPDCpuVAddr) {
                pui32Tmp = (u32 *) pvPDCpuVAddr;
@@ -568,8 +557,8 @@ enum PVRSRV_ERROR MMU_Initialise(struct PVRSRV_DEVICE_NODE *psDeviceNode,
                pui32Tmp[i] = 0;
 
        PDUMPCOMMENT("Page directory contents");
-       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX, pvPDCpuVAddr, SGX_MMU_PAGE_SIZE, 0,
-                 IMG_TRUE, PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG);
+       PDUMPMEM2(pvPDCpuVAddr, SGX_MMU_PAGE_SIZE, IMG_TRUE,
+                 PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG);
 
        psMMUContext->pvPDCpuVAddr = pvPDCpuVAddr;
        psMMUContext->sPDDevPAddr = sPDDevPAddr;
@@ -600,8 +589,7 @@ void MMU_Finalise(struct MMU_CONTEXT *psMMUContext)
        }
 
        PDUMPCOMMENT("Free page directory");
-       PDUMPFREEPAGETABLE(PVRSRV_DEVICE_TYPE_SGX, psMMUContext->pvPDCpuVAddr,
-                          PDUMP_PT_UNIQUETAG);
+       PDUMPFREEPAGETABLE(psMMUContext->pvPDCpuVAddr);
 
        pui32Tmp = (u32 *) psMMUContext->pvPDCpuVAddr;
 
@@ -677,9 +665,8 @@ void MMU_InsertHeap(struct MMU_CONTEXT *psMMUContext,
                pui32PDCpuVAddr[ui32PDEntry] =
                    pui32KernelPDCpuVAddr[ui32PDEntry];
                if (pui32PDCpuVAddr[ui32PDEntry]) {
-                       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                 (void *) &pui32PDCpuVAddr[ui32PDEntry],
-                                 sizeof(u32), 0, IMG_FALSE,
+                       PDUMPMEM2((void *) &pui32PDCpuVAddr[ui32PDEntry],
+                                 sizeof(u32), IMG_FALSE,
                                  PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG);
 
                        bInvalidateDirectoryCache = IMG_TRUE;
@@ -726,10 +713,9 @@ static void MMU_PDumpPageTables(struct MMU_HEAP *pMMUHeap,
 
                if (psPTInfo) {
                        pui32PTEntry = (u32 *)psPTInfo->PTPageCpuVAddr;
-                       PDUMPMEM2(PVRSRV_DEVICE_TYPE_SGX,
-                                 (void *)&pui32PTEntry[ui32PTIndex],
-                                 ui32PTDumpCount * sizeof(u32), 0,
-                                 IMG_FALSE, PDUMP_PT_UNIQUETAG, hUniqueTag);
+                       PDUMPMEM2((void *)&pui32PTEntry[ui32PTIndex],
+                                 ui32PTDumpCount * sizeof(u32), IMG_FALSE,
+                                 PDUMP_PT_UNIQUETAG, hUniqueTag);
                }
 
                ui32NumPTEntries -= ui32PTDumpCount;

diff --git a/pvr/pvr_pdump.c b/pvr/pvr_pdump.c
index 4bf8cd4..95a978c 100644 (file)
--- a/pvr/pvr_pdump.c
+++ b/pvr/pvr_pdump.c
@@ -312,16 +312,13 @@ void PDumpRegPolKM(u32 ui32RegAddr, u32 ui32RegValue, u32 ui32Mask)
                               PDUMP_FLAGS_CONTINUOUS);
 }
 
-void PDumpMallocPages(enum PVRSRV_DEVICE_TYPE eDeviceType, u32 ui32DevVAddr,
-                     void *pvLinAddr, void *hOSMemHandle, u32 ui32NumBytes,
-                     void *hUniqueTag)
+void PDumpMallocPages(u32 ui32DevVAddr, void *hOSMemHandle,
+                     u32 ui32NumBytes, void *hUniqueTag)
 {
        struct IMG_CPU_PHYADDR sCpuPAddr;
        struct IMG_DEV_PHYADDR sDevPAddr;
        u32 ui32Offset;
 
-       PVR_UNREFERENCED_PARAMETER(pvLinAddr);
-
        PVR_ASSERT(((u32) ui32DevVAddr & ~PAGE_MASK) == 0);
        PVR_ASSERT(hOSMemHandle);
        PVR_ASSERT(((u32) ui32NumBytes & ~PAGE_MASK) == 0);
@@ -332,7 +329,7 @@ void PDumpMallocPages(enum PVRSRV_DEVICE_TYPE eDeviceType, u32 ui32DevVAddr,
        for (ui32Offset = 0; ui32Offset < ui32NumBytes;
             ui32Offset += PAGE_SIZE) {
                sCpuPAddr = OSMemHandleToCpuPAddr(hOSMemHandle, ui32Offset);
-               sDevPAddr = SysCpuPAddrToDevPAddr(eDeviceType, sCpuPAddr);
+               sDevPAddr = SysCpuPAddrToDevPAddr(0, sCpuPAddr);
 
                pdump_print(PDUMP_FLAGS_CONTINUOUS,
                            "MALLOC :SGXMEM:PA_%8.8X%8.8X %u %u 0x%8.8X\r\n",
@@ -341,8 +338,7 @@ void PDumpMallocPages(enum PVRSRV_DEVICE_TYPE eDeviceType, u32 ui32DevVAddr,
        }
 }
 
-void PDumpMallocPageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                         void *pvLinAddr, void *hUniqueTag)
+void PDumpMallocPageTable(void *pvLinAddr, void *hUniqueTag)
 {
        struct IMG_CPU_PHYADDR sCpuPAddr;
        struct IMG_DEV_PHYADDR sDevPAddr;
@@ -353,7 +349,7 @@ void PDumpMallocPageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
                     PAGE_SIZE, PAGE_SIZE);
 
        sCpuPAddr = OSMapLinToCPUPhys(pvLinAddr);
-       sDevPAddr = SysCpuPAddrToDevPAddr(eDeviceType, sCpuPAddr);
+       sDevPAddr = SysCpuPAddrToDevPAddr(0, sCpuPAddr);
 
        pdump_print(PDUMP_FLAGS_CONTINUOUS, "MALLOC :SGXMEM:PA_%8.8X%8.8lX "
                    "0x%lX %lu 0x%8.8lX\r\n", (u32)hUniqueTag,
@@ -389,8 +385,7 @@ void PDumpFreePages(struct BM_HEAP *psBMHeap, struct IMG_DEV_VIRTADDR sDevVAddr,
        }
 }
 
-void PDumpFreePageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                       void *pvLinAddr, void *hUniqueTag)
+void PDumpFreePageTable(void *pvLinAddr)
 {
        struct IMG_CPU_PHYADDR sCpuPAddr;
        struct IMG_DEV_PHYADDR sDevPAddr;
@@ -400,26 +395,24 @@ void PDumpFreePageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
        PDumpComment("FREE :SGXMEM:PAGE_TABLE\r\n");
 
        sCpuPAddr = OSMapLinToCPUPhys(pvLinAddr);
-       sDevPAddr = SysCpuPAddrToDevPAddr(eDeviceType, sCpuPAddr);
+       sDevPAddr = SysCpuPAddrToDevPAddr(0, sCpuPAddr);
 
        pdump_print(PDUMP_FLAGS_CONTINUOUS, "FREE :SGXMEM:PA_%8.8X%8.8lX\r\n",
-                   (u32)hUniqueTag, sDevPAddr.uiAddr);
+                   PDUMP_PT_UNIQUETAG, sDevPAddr.uiAddr);
 }
 
-void PDumpPDRegWithFlags(u32 ui32Reg, u32 ui32Data, u32 ui32Flags,
-                        void *hUniqueTag)
+void PDumpPDRegWithFlags(u32 ui32Reg, u32 ui32Data, u32 ui32Flags)
 {
        pdump_print(ui32Flags,
                    "WRW :SGXREG:0x%8.8X :SGXMEM:PA_%8.8X%8.8lX:0x%8.8lX\r\n",
-                   ui32Reg, (u32)hUniqueTag,
+                   ui32Reg, PDUMP_PD_UNIQUETAG,
                    ui32Data & PAGE_MASK,
                    ui32Data & ~PAGE_MASK);
 }
 
-void PDumpPDReg(u32 ui32Reg, u32 ui32Data, void *hUniqueTag)
+void PDumpPDReg(u32 ui32Reg, u32 ui32Data)
 {
-       PDumpPDRegWithFlags(ui32Reg, ui32Data, PDUMP_FLAGS_CONTINUOUS,
-                           hUniqueTag);
+       PDumpPDRegWithFlags(ui32Reg, ui32Data, PDUMP_FLAGS_CONTINUOUS);
 }
 
 void PDumpMemPolKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
@@ -545,8 +538,7 @@ PDumpMemUM(void *pvAltLinAddrUM, void *pvLinAddrUM,
 }
 
 enum PVRSRV_ERROR
-PDumpMem2KM(enum PVRSRV_DEVICE_TYPE eDeviceType, void *pvLinAddr,
-           u32 ui32Bytes, u32 ui32Flags, IMG_BOOL bInitialisePages,
+PDumpMem2KM(void *pvLinAddr, u32 ui32Bytes, IMG_BOOL bInitialisePages,
            void *hUniqueTag1, void *hUniqueTag2)
 {
        struct IMG_DEV_PHYADDR sDevPAddr;
@@ -569,7 +561,7 @@ PDumpMem2KM(enum PVRSRV_DEVICE_TYPE eDeviceType, void *pvLinAddr,
                            (u32)(PAGE_SIZE - ((u32)pvLinAddr & ~PAGE_MASK)));
 
                sCpuPAddr = OSMapLinToCPUPhys(pvLinAddr);
-               sDevPAddr = SysCpuPAddrToDevPAddr(eDeviceType, sCpuPAddr);
+               sDevPAddr = SysCpuPAddrToDevPAddr(0, sCpuPAddr);
 
                if (bInitialisePages) {
                        pdump_print(PDUMP_FLAGS_CONTINUOUS, "LDB :SGXMEM:"
@@ -665,8 +657,8 @@ void PDumpBitmapKM(char *pszFileName, u32 ui32FileOffset,
                    ui32StrideInBytes, eMemFormat);
 }
 
-static void
-PDumpReadRegKM(char *pszFileName, u32 ui32FileOffset, u32 ui32Address)
+static void PDumpReadRegKM(char *pszFileName, u32 ui32FileOffset,
+                          u32 ui32Address)
 {
        pdump_print(0, "SAB :SGXREG:0x%08X 0x%08X %s\r\n",
                    ui32Address, ui32FileOffset, pszFileName);
@@ -737,7 +729,7 @@ void PDumpHWPerfCBKM(char *pszFileName, u32 ui32FileOffset,
 
 void PDumpCBP(struct PVRSRV_KERNEL_MEM_INFO *psROffMemInfo,
              u32 ui32ROffOffset, u32 ui32WPosVal, u32 ui32PacketSize,
-             u32 ui32BufferSize, u32 ui32Flags, void *hUniqueTag)
+             u32 ui32BufferSize, void *hUniqueTag)
 {
        struct IMG_DEV_PHYADDR sDevPAddr;
        struct IMG_DEV_VIRTADDR sDevVPageAddr;
@@ -751,7 +743,7 @@ void PDumpCBP(struct PVRSRV_KERNEL_MEM_INFO *psROffMemInfo,
        ui32PageOffset = sDevVPageAddr.uiAddr & ~PAGE_MASK;
        BM_GetPhysPageAddr(psROffMemInfo, sDevVPageAddr, &sDevPAddr);
 
-       pdump_print(ui32Flags, "CBP :SGXMEM:PA_%8.8X%8.8lX:0x%8.8lX 0x%8.8X"
+       pdump_print(0, "CBP :SGXMEM:PA_%8.8X%8.8lX:0x%8.8lX 0x%8.8X"
                    " 0x%8.8X 0x%8.8X\r\n", (u32) hUniqueTag,
                    sDevPAddr.uiAddr, ui32PageOffset,
                    ui32WPosVal, ui32PacketSize, ui32BufferSize);

diff --git a/pvr/pvr_pdump.h b/pvr/pvr_pdump.h
index 30232cb..d73a895 100644 (file)
--- a/pvr/pvr_pdump.h
+++ b/pvr/pvr_pdump.h
@@ -59,10 +59,7 @@ enum PVRSRV_ERROR PDumpMemKM(void *pvAltLinAddr,
                             u32 ui32Offset, u32 ui32Bytes,
                             u32 ui32Flags, void *hUniqueTag);
 
-enum PVRSRV_ERROR PDumpMem2KM(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                             void *pvLinAddr,
-                             u32 ui32Bytes,
-                             u32 ui32Flags,
+enum PVRSRV_ERROR PDumpMem2KM(void *pvLinAddr, u32 ui32Bytes,
                              IMG_BOOL bInitialisePages,
                              void *hUniqueTag1, void *hUniqueTag2);
 void PDumpInit(void);
@@ -92,19 +89,15 @@ void PDumpRegPolWithFlagsKM(u32 ui32RegAddr, u32 ui32RegValue,
 
 IMG_BOOL PDumpIsCaptureFrameKM(void);
 
-void PDumpMallocPages(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                     u32 ui32DevVAddr, void *pvLinAddr, void *hOSMemHandle,
+void PDumpMallocPages(u32 ui32DevVAddr, void *hOSMemHandle,
                      u32 ui32NumBytes, void *hUniqueTag);
-void PDumpMallocPageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                         void *pvLinAddr, void *hUniqueTag);
+void PDumpMallocPageTable(void *pvLinAddr, void *hUniqueTag);
 void PDumpFreePages(struct BM_HEAP *psBMHeap,
                    struct IMG_DEV_VIRTADDR sDevVAddr, u32 ui32NumBytes,
                    void *hUniqueTag, IMG_BOOL bInterleaved);
-void PDumpFreePageTable(enum PVRSRV_DEVICE_TYPE eDeviceType,
-                       void *pvLinAddr, void *hUniqueTag);
-void PDumpPDReg(u32 ui32Reg, u32 ui32dwData, void *hUniqueTag);
-void PDumpPDRegWithFlags(u32 ui32Reg, u32 ui32Data, u32 ui32Flags,
-                        void *hUniqueTag);
+void PDumpFreePageTable(void *pvLinAddr);
+void PDumpPDReg(u32 ui32Reg, u32 ui32dwData);
+void PDumpPDRegWithFlags(u32 ui32Reg, u32 ui32Data, u32 ui32Flags);
 
 void PDumpPDDevPAddrKM(struct PVRSRV_KERNEL_MEM_INFO *psMemInfo,
                       u32 ui32Offset, struct IMG_DEV_PHYADDR sPDDevPAddr,
@@ -127,7 +120,7 @@ void PDumpCBP(struct PVRSRV_KERNEL_MEM_INFO *psROffMemInfo,
              u32 ui32ROffOffset,
              u32 ui32WPosVal,
              u32 ui32PacketSize,
-             u32 ui32BufferSize, u32 ui32Flags, void *hUniqueTag);
+             u32 ui32BufferSize, void *hUniqueTag);
 
 void PDumpIDLWithFlags(u32 ui32Clocks, u32 ui32Flags);
 

diff --git a/pvr/sgxreset.c b/pvr/sgxreset.c
index 4d9dab0..b84961e 100644 (file)
--- a/pvr/sgxreset.c
+++ b/pvr/sgxreset.c
@@ -205,7 +205,7 @@ void SGXReset(struct PVRSRV_SGXDEV_INFO *psDevInfo, u32 ui32PDUMPFlags)
                             psDevInfo->sKernelPDDevPAddr.uiAddr);
                PDUMPPDREGWITHFLAGS(ui32EDMDirListReg,
                                    psDevInfo->sKernelPDDevPAddr.uiAddr,
-                                   ui32PDUMPFlags, PDUMP_PD_UNIQUETAG);
+                                   ui32PDUMPFlags);
        }
 
        SGXResetInvalDC(psDevInfo, ui32PDUMPFlags, IMG_TRUE);