From c379c0232d3717e74cfff9bd7459c2cbce6390fb Mon Sep 17 00:00:00 2001 From: Luc Verhaegen Date: Fri, 11 Mar 2011 15:02:43 +0100 Subject: [PATCH] gpu: pvr: pdump: rename PDumpMem2KM to PDumpPageTableKM Signed-off-by: Luc Verhaegen Signed-off-by: Imre Deak --- pvr/mmu.c | 47 ++++++++++++++++++++++++----------------------- pvr/pvr_pdump.c | 4 ++-- pvr/pvr_pdump.h | 10 +++++----- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pvr/mmu.c b/pvr/mmu.c index 1c70c20..0c68876 100644 --- a/pvr/mmu.c +++ b/pvr/mmu.c @@ -157,10 +157,11 @@ static void _DeferredFreePageTable(struct MMU_HEAP *pMMUHeap, u32 ui32PTIndex) (u32 *) psMMUContext->pvPDCpuVAddr; pui32PDEntry += ui32PDIndex; pui32PDEntry[ui32PTIndex] = 0; - PDUMPMEM2((void *) &pui32PDEntry[ui32PTIndex], - sizeof(u32), IMG_FALSE, - PDUMP_PT_UNIQUETAG, - PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE((void *) &pui32PDEntry + [ui32PTIndex], + sizeof(u32), IMG_FALSE, + PDUMP_PT_UNIQUETAG, + PDUMP_PT_UNIQUETAG); psMMUContext = psMMUContext->psNext; } break; @@ -173,9 +174,9 @@ static void _DeferredFreePageTable(struct MMU_HEAP *pMMUHeap, u32 ui32PTIndex) (u32 *) pMMUHeap->psMMUContext->pvPDCpuVAddr; pui32PDEntry += ui32PDIndex; pui32PDEntry[ui32PTIndex] = 0; - PDUMPMEM2((void *) &pui32PDEntry[ui32PTIndex], - sizeof(u32), IMG_FALSE, - PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE((void *) &pui32PDEntry[ui32PTIndex], + sizeof(u32), IMG_FALSE, + PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); break; } default: @@ -396,9 +397,9 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap, PDUMPMALLOCPAGETABLE(ppsPTInfoList[i]->PTPageCpuVAddr, PDUMP_PT_UNIQUETAG); - PDUMPMEM2(ppsPTInfoList[i]->PTPageCpuVAddr, - SGX_MMU_PAGE_SIZE, IMG_TRUE, - PDUMP_PT_UNIQUETAG, PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE(ppsPTInfoList[i]->PTPageCpuVAddr, + SGX_MMU_PAGE_SIZE, IMG_TRUE, + PDUMP_PT_UNIQUETAG, PDUMP_PT_UNIQUETAG); switch (pMMUHeap->psDevArena->DevMemHeapType) { case DEVICE_MEMORY_HEAP_SHARED: @@ -419,7 +420,7 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap, sDevPAddr.uiAddr | SGX_MMU_PDE_VALID; - PDUMPMEM2 + PDUMPPAGETABLE ((void *)&pui32PDEntry[i], sizeof(u32), IMG_FALSE, PDUMP_PD_UNIQUETAG, @@ -436,10 +437,10 @@ static IMG_BOOL _DeferredAllocPagetables(struct MMU_HEAP *pMMUHeap, pui32PDEntry[i] = sDevPAddr.uiAddr | SGX_MMU_PDE_VALID; - PDUMPMEM2((void *)&pui32PDEntry[i], - sizeof(u32), IMG_FALSE, - PDUMP_PD_UNIQUETAG, - PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE((void *)&pui32PDEntry[i], + sizeof(u32), IMG_FALSE, + PDUMP_PD_UNIQUETAG, + PDUMP_PT_UNIQUETAG); break; } @@ -557,8 +558,8 @@ enum PVRSRV_ERROR MMU_Initialise(struct PVRSRV_DEVICE_NODE *psDeviceNode, pui32Tmp[i] = 0; PDUMPCOMMENT("Page directory contents"); - PDUMPMEM2(pvPDCpuVAddr, SGX_MMU_PAGE_SIZE, IMG_TRUE, - PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE(pvPDCpuVAddr, SGX_MMU_PAGE_SIZE, IMG_TRUE, + PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); psMMUContext->pvPDCpuVAddr = pvPDCpuVAddr; psMMUContext->sPDDevPAddr = sPDDevPAddr; @@ -665,9 +666,9 @@ void MMU_InsertHeap(struct MMU_CONTEXT *psMMUContext, pui32PDCpuVAddr[ui32PDEntry] = pui32KernelPDCpuVAddr[ui32PDEntry]; if (pui32PDCpuVAddr[ui32PDEntry]) { - PDUMPMEM2((void *) &pui32PDCpuVAddr[ui32PDEntry], - sizeof(u32), IMG_FALSE, - PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); + PDUMPPAGETABLE((void *) &pui32PDCpuVAddr[ui32PDEntry], + sizeof(u32), IMG_FALSE, + PDUMP_PD_UNIQUETAG, PDUMP_PT_UNIQUETAG); bInvalidateDirectoryCache = IMG_TRUE; } @@ -713,9 +714,9 @@ static void MMU_PDumpPageTables(struct MMU_HEAP *pMMUHeap, if (psPTInfo) { pui32PTEntry = (u32 *)psPTInfo->PTPageCpuVAddr; - PDUMPMEM2((void *)&pui32PTEntry[ui32PTIndex], - ui32PTDumpCount * sizeof(u32), IMG_FALSE, - PDUMP_PT_UNIQUETAG, hUniqueTag); + PDUMPPAGETABLE((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 95a978c..1989204 100644 --- a/pvr/pvr_pdump.c +++ b/pvr/pvr_pdump.c @@ -538,8 +538,8 @@ PDumpMemUM(void *pvAltLinAddrUM, void *pvLinAddrUM, } enum PVRSRV_ERROR -PDumpMem2KM(void *pvLinAddr, u32 ui32Bytes, IMG_BOOL bInitialisePages, - void *hUniqueTag1, void *hUniqueTag2) +PDumpPageTableKM(void *pvLinAddr, u32 ui32Bytes, IMG_BOOL bInitialisePages, + void *hUniqueTag1, void *hUniqueTag2) { struct IMG_DEV_PHYADDR sDevPAddr; struct IMG_CPU_PHYADDR sCpuPAddr; diff --git a/pvr/pvr_pdump.h b/pvr/pvr_pdump.h index d73a895..895e698 100644 --- a/pvr/pvr_pdump.h +++ b/pvr/pvr_pdump.h @@ -59,9 +59,9 @@ enum PVRSRV_ERROR PDumpMemKM(void *pvAltLinAddr, u32 ui32Offset, u32 ui32Bytes, u32 ui32Flags, void *hUniqueTag); -enum PVRSRV_ERROR PDumpMem2KM(void *pvLinAddr, u32 ui32Bytes, - IMG_BOOL bInitialisePages, - void *hUniqueTag1, void *hUniqueTag2); +enum PVRSRV_ERROR PDumpPageTableKM(void *pvLinAddr, u32 ui32Bytes, + IMG_BOOL bInitialisePages, + void *hUniqueTag1, void *hUniqueTag2); void PDumpInit(void); void PDumpDeInit(void); void PDumpSetFrameKM(u32 ui32Frame); @@ -129,7 +129,7 @@ void PDumpResumeKM(void); #define PDUMPMEMPOL PDumpMemPolKM #define PDUMPMEM PDumpMemKM -#define PDUMPMEM2 PDumpMem2KM +#define PDUMPPAGETABLE PDumpPageTableKM #define PDUMPMEMUM PDumpMemUM #define PDUMPINIT PDumpInit #define PDUMPDEINIT PDumpDeInit @@ -155,7 +155,7 @@ void PDumpResumeKM(void); #define PDUMPMEMPOL(args...) #define PDUMPMEM(args...) -#define PDUMPMEM2(args...) +#define PDUMPPAGETABLE(args...) #define PDUMPMEMUM(args...) #define PDUMPINIT(args...) #define PDUMPDEINIT(args...) -- 2.39.5