gpu: pvr: Update to DDK 1.7.17.4142

1 files changed, 58 insertions, 97 deletions

diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile
index 0dc058d..020a87f 100644
--- a/drivers/gpu/pvr/Makefile
+++ b/drivers/gpu/pvr/Makefile
@@ -1,89 +1,75 @@
-#
-ccflags-y = -DLINUX -D__linux__ -Idrivers/gpu/pvr \
-	-DANDROID \
-	-DPVR_BUILD_DIR="\"omap_sgx_android\"" \
-	-DSGX_DYNAMIC_TIMING_INFO \
-	-DSYS_CUSTOM_POWERLOCK_WRAP \
+
+ccflags-y = -DLINUX -D__linux__ -DANDROID -DPVR_BUILD_DIR="\"omap4430_android\""
+ccflags-y += -Idrivers/gpu/pvr -Idrivers/gpu/pvr/omap4 -Idrivers/video/omap2
+
+ccflags-y += \
+	-DSUPPORT_SGX_NEW_STATUS_VALS \
+	-DSUPPORT_SGX_HWPERF \
+	-DSYS_USING_INTERRUPTS \
+	-DPVR_SECURE_HANDLES
+
+ccflags-y += \
 	-DSERVICES4 \
+	-DSUPPORT_SGX_EVENT_OBJECT \
+	-DTRANSFER_QUEUE
+
+ccflags-y += \
+	-DSUPPORT_SGX \
+	-DSGX_DYNAMIC_TIMING_INFO \
 	-DSUPPORT_SRVINIT \
-	-DSUPPORT_PERCONTEXT_PB \
-	-DTRANSFER_QUEUE \
-	-DSYS_USING_INTERRUPTS \
-	-DPVR_SECURE_HANDLES \
+	-DSUPPORT_HW_RECOVERY \
 	-DPVR_SECURE_FD_EXPORT \
+	-DSUPPORT_SGX_EVENT_OBJECT \
 	-DLDM_PLATFORM \
-	-DSUPPORT_SGX_HWPERF \
-	-DSUPPORT_MEMINFO_IDS \
-	-DDISPLAY_CONTROLLER=omaplfb \
-	-DSYS_SGX_ACTIVE_POWER_LATENCY_MS=1 \
-	-DPVR_BUILD_DATE="" \
-	-DSUPPORT_SGX \
-	-DCLIENT_DRIVER_DEFAULT_WAIT_RETRIES=50 \
-	-DPVR_LINUX_TIMERS_USING_WORKQUEUES \
-	-DFLIP_TECHNIQUE_OVERLAY \
+	-DPVR2D_ALT_2DHW \
+	-DSUPPORT_SGX_LOW_LATENCY_SCHEDULING \
 	-DPVR_LINUX_USING_WORKQUEUES \
-	-DSUPPORT_ANDROID_PLATFORM \
 	-DPVR_LINUX_MISR_USING_PRIVATE_WORKQUEUE \
+	-DPVR_LINUX_TIMERS_USING_WORKQUEUES \
 	-DSYS_CUSTOM_POWERLOCK_WRAP \
-	-DSUPPORT_SGX_NEW_STATUS_VALS \
-        -DSYS_OMAP3430_PIN_MEMORY_BUS_CLOCK \
-	-DSGX_EARLYSUSPEND \
-	-DPVRSRV_MODNAME="\"pvrsrvkm"\"
-
-ccflags-$(CONFIG_SGX540) +=  -Idrivers/gpu/pvr/omap4  -Idrivers/gpu/pvr/sgx \
-	-DNO_OMAP_TIMER \
-	-DSGX_CLK_CORE_DIV5 \
-	-DSGX540 -DSUPPORT_SGX540
+	-DSUPPORT_CPU_CACHED_BUFFERS \
+	-DSUPPORT_CACHEFLUSH_ON_ALLOC \
+	-DPVR_NO_FULL_CACHE_OPS \
+	-DSUPPORT_MEMINFO_IDS \
+	-DDISPLAY_CONTROLLER=omaplfb \
+	-DSYS_SGX_ACTIVE_POWER_LATENCY_MS=100 \
+	-DPVR_PROC_USE_SEQ_FILE \
+	-DPVR_BUILD_DATE="" \
+	-DPVRSRV_MODNAME="\"pvrsrvkm\"" \
+	-Idrivers/gpu/pvr/sgx
 
-ccflags-$(CONFIG_SGX_REV110) += -DSGX_CORE_REV=110
-ccflags-$(CONFIG_SGX_REV120) += -DSGX_CORE_REV=120
+ccflags-$(CONFIG_PVR_SGXCORE_540) += \
+	-DSGX540 -DSUPPORT_SGX540 \
+	-DSGX_CORE_REV=120
 
-ccflags-$(CONFIG_SGX530) +=  -Idrivers/gpu/pvr/omap3  -Idrivers/gpu/pvr/sgx \
-	-DSGX530 -DSUPPORT_SGX530
+ccflags-$(CONFIG_PVR_BUILD_RELEASE) += \
+	-DPVR_BUILD_TYPE="\"release\"" -DRELEASE
 
-ccflags-$(CONFIG_SGX_REV125) += -DSGX_CORE_REV=125
-ccflags-$(CONFIG_SGX_REV121) += -DSGX_CORE_REV=121
+ccflags-$(CONFIG_PVR_BUILD_DEBUG) += \
+	-DPVR_BUILD_TYPE="\"debug\"" -DDEBUG
 
-ccflags-$(CONFIG_SGX_530_BUILD_RELEASE) += \
-	-DPVR_BUILD_TYPE="\"release\"" \
-	-DRELEASE \
-	-DSUPPORT_ACTIVE_POWER_MANAGEMENT \
-	-DSUPPORT_HW_RECOVERY \
-	-DSUPPORT_SGX_LOW_LATENCY_SCHEDULING
+ccflags-$(CONFIG_PVR_NEED_PVR_DPF) += -DPVRSRV_NEED_PVR_DPF -DPVRSRV_NEED_PVR_TRACE
+ccflags-$(CONFIG_PVR_NEED_PVR_ASSERT) += -DPVRSRV_NEED_PVR_ASSERT
 
-ccflags-$(CONFIG_SGX_530_BUILD_DEBUG) += \
-	-DPVR_BUILD_TYPE="\"debug\""  -DDEBUG \
+ccflags-$(CONFIG_PVR_DEBUG_MEMORY) += \
 	-DDEBUG_LINUX_MEMORY_ALLOCATIONS \
 	-DDEBUG_LINUX_MEM_AREAS \
-	-DDEBUG_LINUX_MMAP_AREAS \
-	-DDEBUG_BRIDGE_KM \
-	-DPVRSRV_USSE_EDM_STATUS_DEBUG \
-	-DPVRSRV_DUMP_MK_TRACE \
-	-DDEBUG_LOG_PATH_TRUNCATE="\"eurasia_km\""
+	-DDEBUG_LINUX_MMAP_AREAS
 
-ccflags-$(CONFIG_SGX_540_BUILD_RELEASE) += \
-	-DPVR_BUILD_TYPE="\"release\"" \
-	-DRELEASE \
-	-DSUPPORT_ACTIVE_POWER_MANAGEMENT \
-	-DPVR_NO_FULL_CACHE_OPS \
-	-DSUPPORT_SGX_LOW_LATENCY_SCHEDULING
+ccflags-$(CONFIG_PVR_DEBUG_BRIDGE_KM) += -DDEBUG_BRIDGE_KM
+ccflags-$(CONFIG_PVR_DEBUG_TRACE_BRIDGE_KM) += -DDEBUG_TRACE_BRIDGE_KM
+ccflags-$(CONFIG_PVR_DEBUG_BRIDGE_KM_DISPATCH_TABLE) += -DDEBUG_BRIDGE_KM_DISPATCH_TABLE
 
-ccflags-$(CONFIG_SGX_540_BUILD_DEBUG) += \
-	-DPVR_BUILD_TYPE="\"debug\""  -DDEBUG \
-	-DDEBUG_LINUX_MEMORY_ALLOCATIONS \
-	-DDEBUG_LINUX_MEM_AREAS \
-	-DDEBUG_LINUX_MMAP_AREAS \
-	-DDEBUG_BRIDGE_KM \
-	-DPVRSRV_USSE_EDM_STATUS_DEBUG \
-	-DPVRSRV_DUMP_MK_TRACE \
-	-DSUPPORT_ACTIVE_POWER_MANAGEMENT \
-	-DPVR_NO_FULL_CACHE_OPS \
-	-DDEBUG_LOG_PATH_TRUNCATE="\"eurasia_km\""
+ccflags-$(CONFIG_PVR_PERCONTEXT_PB) += -DSUPPORT_PERCONTEXT_PB
+ccflags-$(CONFIG_PVR_SGX_LOW_LATENCY_SCHEDULING) += -DSUPPORT_SGX_LOW_LATENCY_SCHEDULING
+ccflags-$(CONFIG_PVR_ACTIVE_POWER_MANAGEMENT) += -DSUPPORT_ACTIVE_POWER_MANAGEMENT
+ccflags-$(CONFIG_PVR_USSE_EDM_STATUS_DEBUG) += -DPVRSRV_USSE_EDM_STATUS_DEBUG
+ccflags-$(CONFIG_PVR_DUMP_MK_TRACE) += -DPVRSRV_DUMP_MK_TRACE
 
-ccflags-$(CONFIG_SGX_PDUMP) += -Idrivers/gpu/pvr/pdump \
-	-DPDUMP
+ccflags-$(CONFIG_PVR_PDUMP) += \
+	-DPDUMP -DSUPPORT_DBGDRV_EVENT_OBJECTS -DSUPPORT_PDUMP_MULTI_PROCESS
 
-pvr_common-y := \
+pvrsrvkm-y := \
 	osfunc.o \
 	mutils.o \
 	mmap.o \
@@ -113,18 +99,8 @@ pvr_common-y := \
 	bridged_pvr_bridge.o \
 	perproc.o \
 	lists.o \
-	mem_debug.o \
-	osfunc_common.o
-
-pvr540-$(CONFIG_SGX540) := \
 	omap4/sysconfig.o \
-	omap4/sysutils.o
-
-pvr530-$(CONFIG_SGX530) := \
-	omap3/sysconfig.o \
-	omap3/sysutils.o
-
-sgx-y :=  \
+	omap4/sysutils.o \
 	sgx/bridged_sgx_bridge.o \
 	sgx/sgxinit.o \
 	sgx/sgxpower.o \
@@ -135,25 +111,10 @@ sgx-y :=  \
 	sgx/mmu.o \
 	sgx/pb.o
 
-sgx_displayclass-y := \
-	display/omap_sgx_displayclass.o \
-	display/omap_display.o
-
 omaplfb-y := \
 	omaplfb/omaplfb_displayclass.o \
-	omaplfb/omaplfb-sysfs.o \
 	omaplfb/omaplfb_linux.o
 
-dbgdrv-$(CONFIG_SGX_PDUMP) := \
-	pdump/main.o \
-	pdump/dbgdriv.o \
-	pdump/ioctl.o \
-	pdump/handle.o \
-	pdump/hostfunc.o \
-	pdump/hotkey.o
-
-obj-$(CONFIG_SGX540) := pvr_common.o sgx.o omaplfb.o pvr540.o
-obj-$(CONFIG_SGX530) := pvr_common.o sgx.o omaplfb.o pvr530.o
-obj-$(CONFIG_VIRTUAL_DISPLAY_SUPPORT) := pvr_common.o sgx.o \
-	sgx_displayclass.o pvr540.o
-obj-$(CONFIG_SGX_PDUMP) += dbgdrv.o
+obj-$(CONFIG_PVR_SGX) += pvrsrvkm.o
+obj-$(CONFIG_PVR_SGX) += omaplfb.o
+obj-$(CONFIG_PVR_PDUMP) += dbgdrv/