1 files changed, 40 insertions, 5 deletions

diff --git a/drivers/gpu/pvr/osfunc.c b/drivers/gpu/pvr/osfunc.c
index 9a264d23a87..2bcf0ed40ce 100644
--- a/drivers/gpu/pvr/osfunc.c
+++ b/drivers/gpu/pvr/osfunc.c
@@ -115,6 +115,15 @@ PVRSRV_ERROR OSAllocMem_Impl(IMG_UINT32 ui32Flags, IMG_UINT32 ui32Size, IMG_PVOI
     return PVRSRV_OK;
 }
 
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24))
+
+static inline int is_vmalloc_addr(const void *pvCpuVAddr)
+{
+        unsigned long lAddr = (unsigned long)pvCpuVAddr;
+        return lAddr >= VMALLOC_START && lAddr < VMALLOC_END;
+}
+
+#endif
 
 #if !defined(DEBUG_LINUX_MEMORY_ALLOCATIONS)
 PVRSRV_ERROR OSFreeMem_Impl(IMG_UINT32 ui32Flags, IMG_UINT32 ui32Size, IMG_PVOID pvCpuVAddr, IMG_HANDLE hBlockAlloc)
@@ -2950,6 +2959,29 @@ IMG_VOID OSFlushCPUCacheKM(IMG_VOID)
 #endif
 }
 
+static inline size_t pvr_dmac_range_len(const void *pvStart, const void *pvEnd)
+{
+        return (size_t)((char *)pvEnd - (char *)pvStart);
+}
+
+static void pvr_dmac_inv_range(const void *pvStart, const void *pvEnd)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34))
+        dmac_inv_range(pvStart, pvEnd);
+#else
+        dmac_map_area(pvStart, pvr_dmac_range_len(pvStart, pvEnd), DMA_FROM_DEVICE);
+#endif
+}
+
+static void pvr_dmac_clean_range(const void *pvStart, const void *pvEnd)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34))
+        dmac_clean_range(pvStart, pvEnd);
+#else
+        dmac_map_area(pvStart, pvr_dmac_range_len(pvStart, pvEnd), DMA_TO_DEVICE);
+#endif
+}
+
 IMG_BOOL OSFlushCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                 IMG_VOID *pvRangeAddrStart,
                                                                 IMG_UINT32 ui32Length)
@@ -2963,7 +2995,7 @@ IMG_BOOL OSCleanCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                 IMG_UINT32 ui32Length)
 {
         return CheckExecuteCacheOp(hOSMemHandle, pvRangeAddrStart, ui32Length,
-                                                           dmac_clean_range, outer_clean_range);
+                                                           pvr_dmac_clean_range, outer_clean_range);
 }
 
 IMG_BOOL OSInvalidateCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
@@ -2971,7 +3003,7 @@ IMG_BOOL OSInvalidateCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                          IMG_UINT32 ui32Length)
 {
         return CheckExecuteCacheOp(hOSMemHandle, pvRangeAddrStart, ui32Length,
-                                                           dmac_inv_range, outer_inv_range);
+                                                           pvr_dmac_inv_range, outer_inv_range);
 }
 
 #else 
@@ -2993,7 +3025,8 @@ IMG_BOOL OSFlushCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                 IMG_VOID *pvRangeAddrStart,
                                                                 IMG_UINT32 ui32Length)
 {
-        dma_cache_wback_inv((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
+        if (ui32Length)
+                dma_cache_wback_inv((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
         return IMG_TRUE;
 }
 
@@ -3001,7 +3034,8 @@ IMG_BOOL OSCleanCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                 IMG_VOID *pvRangeAddrStart,
                                                                 IMG_UINT32 ui32Length)
 {
-        dma_cache_wback((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
+        if (ui32Length)
+                dma_cache_wback((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
         return IMG_TRUE;
 }
 
@@ -3009,7 +3043,8 @@ IMG_BOOL OSInvalidateCPUCacheRangeKM(IMG_HANDLE hOSMemHandle,
                                                                          IMG_VOID *pvRangeAddrStart,
                                                                          IMG_UINT32 ui32Length)
 {
-        dma_cache_inv((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
+        if (ui32Length)
+                dma_cache_inv((IMG_UINTPTR_T)pvRangeAddrStart, ui32Length);
         return IMG_TRUE;
 }