aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew F. Davis2019-04-19 21:02:49 -0500
committerPraneeth Bajjuri2019-04-19 15:07:23 -0500
commit31867364d9020e309867cee24b1f83eab562e94f (patch)
tree2ac6246d6823145af2c0738178340f090603e21b
parentad863d48d21ef495a51194e580b1f71edd11aa09 (diff)
downloadkernel-31867364d9020e309867cee24b1f83eab562e94f.tar.gz
kernel-31867364d9020e309867cee24b1f83eab562e94f.tar.xz
kernel-31867364d9020e309867cee24b1f83eab562e94f.zip
drivers: gpu: pvr: Add support for AM65x
Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--drivers/gpu/Makefile2
-rw-r--r--drivers/gpu/pvr/Kconfig9
-rw-r--r--drivers/gpu/pvr/Makefile10
-rw-r--r--drivers/gpu/pvr/config_kernel_am57x.h (renamed from drivers/gpu/pvr/config_kernel.h)0
-rw-r--r--drivers/gpu/pvr/config_kernel_am65x.h54
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 @@
4obj-$(CONFIG_TEGRA_HOST1X) += host1x/ 4obj-$(CONFIG_TEGRA_HOST1X) += host1x/
5obj-y += drm/ vga/ 5obj-y += drm/ vga/
6obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ 6obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
7obj-$(CONFIG_PVR_SGX544) += pvr/ 7obj-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
5 default n 5 default n
6 help 6 help
7 Support for the PowerVR SGX544 3D core 7 Support for the PowerVR SGX544 3D core
8
9config PVR_SGX544_AM654
10 tristate "PowerVR SGX544 for AM654"
11 depends on !(PVR_SGX544=y || PVR_SGX544=m)
12 depends on PREEMPT
13 depends on SYNC_FILE
14 default n
15 help
16 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 @@
1ifneq ($(CONFIG_PVR_SGX544), )
2ccflags-y += -include $(srctree)/drivers/gpu/pvr/config_kernel_am57x.h
3endif
4
5ifneq ($(CONFIG_PVR_SGX544_AM654), )
6ccflags-y += -include $(srctree)/drivers/gpu/pvr/config_kernel_am65x.h
7endif
8
1ccflags-y += \ 9ccflags-y += \
2 -D__linux__ \ 10 -D__linux__ \
3 -include $(srctree)/drivers/gpu/pvr/config_kernel.h \
4 -Idrivers/gpu/pvr/include4 \ 11 -Idrivers/gpu/pvr/include4 \
5 -Idrivers/gpu/pvr/services4/include \ 12 -Idrivers/gpu/pvr/services4/include \
6 -Idrivers/gpu/pvr/services4/system/omap \ 13 -Idrivers/gpu/pvr/services4/system/omap \
@@ -64,3 +71,4 @@ pvrsrvkm-y += \
64 services4/system/omap/sysutils.o \ 71 services4/system/omap/sysutils.o \
65 72
66obj-$(CONFIG_PVR_SGX544) += pvrsrvkm.o 73obj-$(CONFIG_PVR_SGX544) += pvrsrvkm.o
74obj-$(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 @@
1#define SGX_FEATURE_MP_CORE_COUNT 1
2#define LINUX
3#define PVR_BUILD_DIR "omap_android"
4#define PVR_BUILD_TYPE "release"
5#define PVRSRV_MODNAME "pvrsrvkm"
6#define USE_64BIT_COMPAT
7#define SGXCORE 544
8#define SGX544
9#define SUPPORT_SGX544
10#define SUPPORT_SGX
11#define SGX_CORE_REV 117
12#define TRANSFER_QUEUE
13#define PVR_SECURE_HANDLES
14#define SUPPORT_LISR_MISR_SYNC
15#define PVR_LINUX_MEM_AREA_POOL_MAX_PAGES 10800
16#define PVR_LINUX_MEM_AREA_USE_VMAP
17#define PVR_LINUX_MEM_AREA_POOL_ALLOW_SHRINK
18#define RELEASE
19#define SUPPORT_PERCONTEXT_PB
20#define SUPPORT_HW_RECOVERY
21#define SUPPORT_SGX_HWPERF
22#define SUPPORT_SGX_LOW_LATENCY_SCHEDULING
23#define SUPPORT_MEMINFO_IDS
24#define SUPPORT_SGX_NEW_STATUS_VALS
25#define SUPPORT_DBGDRV_EVENT_OBJECTS
26#define SGX_FEATURE_SYSTEM_CACHE
27#define SGX_FEATURE_MP
28#define SYS_USING_INTERRUPTS
29#define PVRSRV_NEW_PVR_DPF
30#define PVRSRV_NEED_PVR_DPF
31#define SUPPORT_DMABUF
32#define IMG_ADDRSPACE_PHYSADDR_BITS 32
33#define SUPPORT_LINUX_X86_WRITECOMBINE
34#define SUPPORT_LINUX_X86_PAT
35#define SGX_DYNAMIC_TIMING_INFO
36#define SYS_CUSTOM_POWERLOCK_WRAP
37#define PVR_LINUX_USING_WORKQUEUES
38#define PVR_LINUX_MISR_USING_PRIVATE_WORKQUEUE
39#define PVR_LINUX_TIMERS_USING_WORKQUEUES
40#define LDM_PLATFORM
41#define PVR_LDM_DEVICE_TREE
42#define PVR_LDM_PLATFORM_PRE_REGISTERED
43#define PVR_LDM_PLATFORM_PRE_REGISTERED_DEV "pvrsrvkm"
44#define PVR_LDM_DRIVER_REGISTRATION_NAME "pvrsrvkm"
45#define SUPPORT_LARGE_GENERAL_HEAP
46#define ANDROID
47#define PVR_ANDROID_NATIVE_WINDOW_HAS_FENCE
48#define SUPPORT_ION_HEADER "../drivers/staging/android/ion/ion.h"
49#define SUPPORT_ION_PRIV_HEADER "../drivers/staging/android/ion/ion_priv.h"
50#define SUPPORT_ION_USE_SG_LENGTH
51#define PVR_NO_OMAP_TIMER
52#define VS_PRODUCT_VERSION 6
53#define SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED
54#define SUPPORT_TI_VERSION_STRING