drivers: gpu: pvr: Add support for AM65x

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

5 files changed, 73 insertions, 2 deletions

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 81f5275bddac..3540936dcc77 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -4,4 +4,4 @@
 obj-$(CONFIG_TEGRA_HOST1X)      += host1x/
 obj-y                   += drm/ vga/
 obj-$(CONFIG_IMX_IPUV3_CORE)    += ipu-v3/
-obj-$(CONFIG_PVR_SGX544)        += pvr/
+obj-y                   += pvr/
diff --git a/drivers/gpu/pvr/Kconfig b/drivers/gpu/pvr/Kconfig
index dbb433a23715..ae26547b058e 100644
--- a/drivers/gpu/pvr/Kconfig
+++ b/drivers/gpu/pvr/Kconfig
@@ -5,3 +5,12 @@ config PVR_SGX544
         default n
         help
           Support for the PowerVR SGX544 3D core
+
+config PVR_SGX544_AM654
+        tristate "PowerVR SGX544 for AM654"
+        depends on !(PVR_SGX544=y || PVR_SGX544=m)
+        depends on PREEMPT
+        depends on SYNC_FILE
+        default n
+        help
+          Support for the PowerVR SGX544 3D core on AM654
diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile
index 533c1316037b..9cadeb061115 100644
--- a/drivers/gpu/pvr/Makefile
+++ b/drivers/gpu/pvr/Makefile
@@ -1,6 +1,13 @@
+ifneq ($(CONFIG_PVR_SGX544), )
+ccflags-y += -include $(srctree)/drivers/gpu/pvr/config_kernel_am57x.h
+endif
+
+ifneq ($(CONFIG_PVR_SGX544_AM654), )
+ccflags-y += -include $(srctree)/drivers/gpu/pvr/config_kernel_am65x.h
+endif
+
 ccflags-y += \
         -D__linux__ \
-        -include $(srctree)/drivers/gpu/pvr/config_kernel.h \
         -Idrivers/gpu/pvr/include4 \
         -Idrivers/gpu/pvr/services4/include \
         -Idrivers/gpu/pvr/services4/system/omap \
@@ -64,3 +71,4 @@ pvrsrvkm-y += \
         services4/system/omap/sysutils.o \
 
 obj-$(CONFIG_PVR_SGX544) += pvrsrvkm.o
+obj-$(CONFIG_PVR_SGX544_AM654) += pvrsrvkm.o
diff --git a/drivers/gpu/pvr/config_kernel.h b/drivers/gpu/pvr/config_kernel_am57x.h
index 3d48ceac21d3..3d48ceac21d3 100644
--- a/drivers/gpu/pvr/config_kernel.h
+++ b/drivers/gpu/pvr/config_kernel_am57x.h
diff --git a/drivers/gpu/pvr/config_kernel_am65x.h b/drivers/gpu/pvr/config_kernel_am65x.h
new file mode 100644
index 000000000000..39c20589b613
--- /dev/null
+++ b/drivers/gpu/pvr/config_kernel_am65x.h
@@ -0,0 +1,54 @@
+#define SGX_FEATURE_MP_CORE_COUNT 1
+#define LINUX
+#define PVR_BUILD_DIR "omap_android"
+#define PVR_BUILD_TYPE "release"
+#define PVRSRV_MODNAME "pvrsrvkm"
+#define USE_64BIT_COMPAT
+#define SGXCORE 544
+#define SGX544
+#define SUPPORT_SGX544
+#define SUPPORT_SGX
+#define SGX_CORE_REV 117
+#define TRANSFER_QUEUE
+#define PVR_SECURE_HANDLES
+#define SUPPORT_LISR_MISR_SYNC
+#define PVR_LINUX_MEM_AREA_POOL_MAX_PAGES 10800
+#define PVR_LINUX_MEM_AREA_USE_VMAP
+#define PVR_LINUX_MEM_AREA_POOL_ALLOW_SHRINK
+#define RELEASE
+#define SUPPORT_PERCONTEXT_PB
+#define SUPPORT_HW_RECOVERY
+#define SUPPORT_SGX_HWPERF
+#define SUPPORT_SGX_LOW_LATENCY_SCHEDULING
+#define SUPPORT_MEMINFO_IDS
+#define SUPPORT_SGX_NEW_STATUS_VALS
+#define SUPPORT_DBGDRV_EVENT_OBJECTS
+#define SGX_FEATURE_SYSTEM_CACHE
+#define SGX_FEATURE_MP
+#define SYS_USING_INTERRUPTS
+#define PVRSRV_NEW_PVR_DPF
+#define PVRSRV_NEED_PVR_DPF
+#define SUPPORT_DMABUF
+#define IMG_ADDRSPACE_PHYSADDR_BITS 32
+#define SUPPORT_LINUX_X86_WRITECOMBINE
+#define SUPPORT_LINUX_X86_PAT
+#define SGX_DYNAMIC_TIMING_INFO
+#define SYS_CUSTOM_POWERLOCK_WRAP
+#define PVR_LINUX_USING_WORKQUEUES
+#define PVR_LINUX_MISR_USING_PRIVATE_WORKQUEUE
+#define PVR_LINUX_TIMERS_USING_WORKQUEUES
+#define LDM_PLATFORM
+#define PVR_LDM_DEVICE_TREE
+#define PVR_LDM_PLATFORM_PRE_REGISTERED
+#define PVR_LDM_PLATFORM_PRE_REGISTERED_DEV "pvrsrvkm"
+#define PVR_LDM_DRIVER_REGISTRATION_NAME "pvrsrvkm"
+#define SUPPORT_LARGE_GENERAL_HEAP
+#define ANDROID
+#define PVR_ANDROID_NATIVE_WINDOW_HAS_FENCE
+#define SUPPORT_ION_HEADER "../drivers/staging/android/ion/ion.h"
+#define SUPPORT_ION_PRIV_HEADER "../drivers/staging/android/ion/ion_priv.h"
+#define SUPPORT_ION_USE_SG_LENGTH
+#define PVR_NO_OMAP_TIMER
+#define VS_PRODUCT_VERSION 6
+#define SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED
+#define SUPPORT_TI_VERSION_STRING