diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-02-06 17:46:16 +0100 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-02-07 15:58:58 +0100 |
| commit | fd27777fe281a97a27058e3eddd06d9eb69f17d3 (patch) | |
| tree | 4ece4c3daed6e60e3a2238d3ca9af5f0c75f91a5 | |
| parent | df98f9227296616e443ee6034040ea8eb5a8a2da (diff) | |
Revert "SGX-KM: Support full cache ops on large buffers"
This reverts commit 8d53d3e0fe5ee15f86502f6051ad79f230238b50.
| -rw-r--r-- | drivers/gpu/pvr/Makefile | 4 | ||||
| -rw-r--r-- | drivers/gpu/pvr/osfunc.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile index e02f1a137d8a..dc7745b7ca9f 100644 --- a/drivers/gpu/pvr/Makefile +++ b/drivers/gpu/pvr/Makefile @@ -69,7 +69,8 @@ ccflags-$(CONFIG_SGX_540_BUILD_RELEASE) += \ -DPVR_BUILD_TYPE="\"release\"" \ -DRELEASE \ -DSUPPORT_ACTIVE_POWER_MANAGEMENT \ - -DSUPPORT_HW_RECOVERY + -DSUPPORT_HW_RECOVERY \ + -DPVR_NO_FULL_CACHE_OPS ccflags-$(CONFIG_SGX_540_BUILD_DEBUG) += \ -DPVR_BUILD_TYPE="\"debug\"" -DDEBUG \ @@ -80,6 +81,7 @@ ccflags-$(CONFIG_SGX_540_BUILD_DEBUG) += \ -DPVRSRV_USSE_EDM_STATUS_DEBUG \ -DPVRSRV_DUMP_MK_TRACE \ -DSUPPORT_ACTIVE_POWER_MANAGEMENT \ + -DPVR_NO_FULL_CACHE_OPS \ -DSUPPORT_HW_RECOVERY \ -DDEBUG_LOG_PATH_TRUNCATE="\"eurasia_km\"" diff --git a/drivers/gpu/pvr/osfunc.c b/drivers/gpu/pvr/osfunc.c index ef700f7e7b59..5f45cdac3bcb 100644 --- a/drivers/gpu/pvr/osfunc.c +++ b/drivers/gpu/pvr/osfunc.c @@ -85,7 +85,6 @@ #endif #define EVENT_OBJECT_TIMEOUT_MS (100) -#define PVR_FULL_CACHE_OP_THRESHOLD (0x7D000) #if !defined(DEBUG_LINUX_MEMORY_ALLOCATIONS) PVRSRV_ERROR OSAllocMem_Impl(IMG_UINT32 ui32Flags, IMG_UINT32 ui32Size, IMG_PVOID *ppvCpuVAddr, IMG_HANDLE *phBlockAlloc) @@ -3065,24 +3064,15 @@ IMG_BOOL OSFlushCPUCacheRangeKM(IMG_HANDLE hOSMemHandle, IMG_UINT32 ui32Length) { return CheckExecuteCacheOp(hOSMemHandle, pvRangeAddrStart, ui32Length, - dmac_flush_range, outer_flush_range); + dmac_flush_range, outer_flush_range); } IMG_BOOL OSCleanCPUCacheRangeKM(IMG_HANDLE hOSMemHandle, IMG_VOID *pvRangeAddrStart, IMG_UINT32 ui32Length) { - IMG_BOOL retval = IMG_TRUE; -#if defined(CONFIG_OUTER_CACHE) && !defined(PVR_NO_FULL_CACHE_OPS) - if (ui32Length > PVR_FULL_CACHE_OP_THRESHOLD) - OSCleanCPUCacheKM(); - else -#endif - { - retval = CheckExecuteCacheOp(hOSMemHandle, pvRangeAddrStart, ui32Length, + return CheckExecuteCacheOp(hOSMemHandle, pvRangeAddrStart, ui32Length, pvr_dmac_clean_range, outer_clean_range); - } - return retval; } IMG_BOOL OSInvalidateCPUCacheRangeKM(IMG_HANDLE hOSMemHandle, |