diff options
| author | Imagination Technologies Ltd <gpl-support@imgtec.com> | 2011-06-15 17:34:10 +0100 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-07-11 17:00:31 -0700 |
| commit | 1a6ba71b9fbe38a1e9ddf1b239115f9073fa260e (patch) | |
| tree | 877bcc7b84ee5da543344f59ba041b55dcb8324d /drivers/gpu | |
| parent | ed393a429c7523371bc4ccfbd7feb2dd7fb9dec0 (diff) | |
| download | kernel_samsung_tuna-1a6ba71b9fbe38a1e9ddf1b239115f9073fa260e.zip kernel_samsung_tuna-1a6ba71b9fbe38a1e9ddf1b239115f9073fa260e.tar.gz kernel_samsung_tuna-1a6ba71b9fbe38a1e9ddf1b239115f9073fa260e.tar.bz2 | |
gpu: pvr: Update to DDK 1.8.18.591 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/pvr/osfunc.c | 22 | ||||
| -rw-r--r-- | drivers/gpu/pvr/pvrversion.h | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/drivers/gpu/pvr/osfunc.c b/drivers/gpu/pvr/osfunc.c index 2fc65c9..f0c6838 100644 --- a/drivers/gpu/pvr/osfunc.c +++ b/drivers/gpu/pvr/osfunc.c @@ -95,13 +95,7 @@ PVRSRV_ERROR OSAllocMem_Impl(IMG_UINT32 ui32Flags, IMG_UINT32 ui32Size, IMG_PVOI PVR_UNREFERENCED_PARAMETER(ui32Flags); PVR_UNREFERENCED_PARAMETER(phBlockAlloc); -#if defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) - *ppvCpuVAddr = _KMallocWrapper(ui32Size, GFP_KERNEL | __GFP_NOWARN, pszFilename, ui32Line); -#else - *ppvCpuVAddr = KMallocWrapper(ui32Size, GFP_KERNEL | __GFP_NOWARN); -#endif - - if(!*ppvCpuVAddr) + if (ui32Size > PAGE_SIZE) { #if defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) @@ -109,12 +103,22 @@ PVRSRV_ERROR OSAllocMem_Impl(IMG_UINT32 ui32Flags, IMG_UINT32 ui32Size, IMG_PVOI #else *ppvCpuVAddr = VMallocWrapper(ui32Size, PVRSRV_HAP_CACHED); #endif - if (!*ppvCpuVAddr) + if (*ppvCpuVAddr) { - return PVRSRV_ERROR_OUT_OF_MEMORY; + return PVRSRV_OK; } } +#if defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) + *ppvCpuVAddr = _KMallocWrapper(ui32Size, GFP_KERNEL | __GFP_NOWARN, pszFilename, ui32Line); +#else + *ppvCpuVAddr = KMallocWrapper(ui32Size, GFP_KERNEL | __GFP_NOWARN); +#endif + if (!*ppvCpuVAddr) + { + return PVRSRV_ERROR_OUT_OF_MEMORY; + } + return PVRSRV_OK; } diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h index 3a7c877..2303e8e 100644 --- a/drivers/gpu/pvr/pvrversion.h +++ b/drivers/gpu/pvr/pvrversion.h @@ -30,8 +30,8 @@ #define PVRVERSION_MAJ 1 #define PVRVERSION_MIN 8 #define PVRVERSION_BRANCH 18 -#define PVRVERSION_BUILD 581 -#define PVRVERSION_STRING "1.8.18.581" +#define PVRVERSION_BUILD 591 +#define PVRVERSION_STRING "1.8.18.591" #define PVRVERSION_FILE "eurasiacon.pj" #endif |