aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2012-06-14 21:51:21 -0700
committerJP Abgrall <jpa@google.com>2012-06-14 21:51:21 -0700
commite8603785d9ea82dd83e578caf2d6e74b304aa62b (patch)
tree318b4f3b985e03612d0540460b9f9acf405f365b /drivers/gpu
parentd00c00ef81aba03db7d7ebcdbc0ca7c11de5d2ec (diff)
downloadkernel_samsung_crespo-e8603785d9ea82dd83e578caf2d6e74b304aa62b.zip
kernel_samsung_crespo-e8603785d9ea82dd83e578caf2d6e74b304aa62b.tar.gz
kernel_samsung_crespo-e8603785d9ea82dd83e578caf2d6e74b304aa62b.tar.bz2
Revert "gpu: pvr: Intentionally leak SGX MMU PTs."
Clicked submit in the wrong window. It needs to go after some other change. This reverts commit cc92b070b828b739cb5653407f8d22ca04762de2 Change-Id: Ie2cc8d1715af6b9c40145f5f3e857051916bea0a Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/pvr/sgx/mmu.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/sgx/mmu.c b/drivers/gpu/pvr/sgx/mmu.c
index 0847312..825ed84 100644
--- a/drivers/gpu/pvr/sgx/mmu.c
+++ b/drivers/gpu/pvr/sgx/mmu.c
@@ -698,17 +698,14 @@ _FreePageTableMemory (MMU_HEAP *pMMUHeap, MMU_PT_INFO *psPTInfoList)
if(pMMUHeap->psDevArena->psDeviceMemoryHeapInfo->psLocalDevMemArena == IMG_NULL)
{
+
MakeKernelPageReadWrite(psPTInfoList->PTPageCpuVAddr);
-#if 0
+
OSFreePages(PVRSRV_HAP_WRITECOMBINE | PVRSRV_HAP_KERNEL_ONLY,
pMMUHeap->ui32PTSize,
psPTInfoList->PTPageCpuVAddr,
psPTInfoList->hPTPageOSMemHandle);
-#else
- OSMemSet(psPTInfoList->PTPageCpuVAddr, 0, pMMUHeap->ui32PTSize);
- MakeKernelPageReadOnly(psPTInfoList->PTPageCpuVAddr);
-#endif
}
else
{