diff options
| author | Imagination Technologies Ltd <gpl-support@imgtec.com> | 2011-03-08 17:34:16 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:06:48 -0700 |
| commit | 52ce8fbb4dcc0b0337c1dcf60348f4772273db83 (patch) | |
| tree | 6e8d898264d5d3b736ee16a46c777f05deef1863 /drivers/gpu/pvr/mem.c | |
| parent | f60a4091d8499f69fd16114b23756b8fbad3f633 (diff) | |
| download | kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.zip kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.tar.gz kernel_samsung_tuna-52ce8fbb4dcc0b0337c1dcf60348f4772273db83.tar.bz2 | |
gpu: pvr: Update to DDK 1.7.17.4142
Diffstat (limited to 'drivers/gpu/pvr/mem.c')
| -rw-r--r-- | drivers/gpu/pvr/mem.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/pvr/mem.c b/drivers/gpu/pvr/mem.c index a2673d5..5b5d1ac 100644 --- a/drivers/gpu/pvr/mem.c +++ b/drivers/gpu/pvr/mem.c @@ -1,6 +1,6 @@ /********************************************************************** * - * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. + * Copyright (C) Imagination Technologies Ltd. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -29,15 +29,17 @@ static PVRSRV_ERROR -FreeSharedSysMemCallBack(IMG_PVOID pvParam, - IMG_UINT32 ui32Param) +FreeSharedSysMemCallBack(IMG_PVOID pvParam, + IMG_UINT32 ui32Param, + IMG_BOOL bDummy) { PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo = pvParam; PVR_UNREFERENCED_PARAMETER(ui32Param); + PVR_UNREFERENCED_PARAMETER(bDummy); OSFreePages(psKernelMemInfo->ui32Flags, - psKernelMemInfo->ui32AllocSize, + psKernelMemInfo->uAllocSize, psKernelMemInfo->pvLinAddrKM, psKernelMemInfo->sMemBlk.hOSMemHandle); @@ -54,7 +56,7 @@ FreeSharedSysMemCallBack(IMG_PVOID pvParam, IMG_EXPORT PVRSRV_ERROR PVRSRVAllocSharedSysMemoryKM(PVRSRV_PER_PROCESS_DATA *psPerProc, IMG_UINT32 ui32Flags, - IMG_SIZE_T ui32Size, + IMG_SIZE_T uSize, PVRSRV_KERNEL_MEM_INFO **ppsKernelMemInfo) { PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo; @@ -73,11 +75,11 @@ PVRSRVAllocSharedSysMemoryKM(PVRSRV_PER_PROCESS_DATA *psPerProc, ui32Flags &= ~PVRSRV_HAP_MAPTYPE_MASK; ui32Flags |= PVRSRV_HAP_MULTI_PROCESS; psKernelMemInfo->ui32Flags = ui32Flags; - psKernelMemInfo->ui32AllocSize = ui32Size; + psKernelMemInfo->uAllocSize = uSize; if(OSAllocPages(psKernelMemInfo->ui32Flags, - psKernelMemInfo->ui32AllocSize, - HOST_PAGESIZE(), + psKernelMemInfo->uAllocSize, + (IMG_UINT32)HOST_PAGESIZE(), &psKernelMemInfo->pvLinAddrKM, &psKernelMemInfo->sMemBlk.hOSMemHandle) != PVRSRV_OK) @@ -111,11 +113,11 @@ PVRSRVFreeSharedSysMemoryKM(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo) if(psKernelMemInfo->sMemBlk.hResItem) { - eError = ResManFreeResByPtr(psKernelMemInfo->sMemBlk.hResItem); + eError = ResManFreeResByPtr(psKernelMemInfo->sMemBlk.hResItem, CLEANUP_WITH_POLL); } else { - eError = FreeSharedSysMemCallBack(psKernelMemInfo, 0); + eError = FreeSharedSysMemCallBack(psKernelMemInfo, 0, CLEANUP_WITH_POLL); } return eError; |