summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2017-01-12 13:45:46 -0600
committerVishal Mahaveer2017-01-12 14:02:49 -0600
commitbc7f838cdc458c3d628db7bae1f1c203b7a43c37 (patch)
tree80fb94fe5f25468133e9d0a16f2f520669b023a4 /jacinto6
parent3943e6c30b06149858c21de506a38eb3795377af (diff)
downloaddevice-ti-proprietary-open-bc7f838cdc458c3d628db7bae1f1c203b7a43c37.tar.gz
device-ti-proprietary-open-bc7f838cdc458c3d628db7bae1f1c203b7a43c37.tar.xz
device-ti-proprietary-open-bc7f838cdc458c3d628db7bae1f1c203b7a43c37.zip
jacinto6: sgx-bin: bins and src update
Updating SGX binaries and KM source update for latest DDK1.14 Change-Id: I6f227ebcab33baa36b52b2746fd5b24af79ab65e Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Diffstat (limited to 'jacinto6')
-rw-r--r--jacinto6/README.SGX4
-rw-r--r--jacinto6/sgx.tgzbin1673390 -> 1673711 bytes
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk4
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk4
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile11
-rw-r--r--jacinto6/sgx_src/eurasia_km/include4/pvrversion.h10
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c35
-rw-r--r--jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk2
-rw-r--r--jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c (renamed from jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c)0
9 files changed, 52 insertions, 18 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index ce68344..ebdaf6c 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -16,9 +16,9 @@ sgx.tgz a set of binaries built for SGX544.
16[DDK Version] 16[DDK Version]
17 1.14/4001660 17 1.14/4001660
18[DDK commit ID] 18[DDK commit ID]
19 3ed372b um: gralloc: change stride alignment to 16 pixels 19 3b54e17 km: Add am57xxevm target to build system
20[Branch] 20[Branch]
21 android/1.14/4001660_k4.4_M 21 android/1.14/4081762_k4.4_M
22[Kernel modules built against] 22[Kernel modules built against]
23 Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y 23 Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y
24[Build type] 24[Build type]
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index b5bfad8..a05c54a 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
index b93243b..f20ee5b 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
@@ -161,6 +161,10 @@ TESTED_HOST_USER_FLAGS += \
161KBUILD_FLAGS := \ 161KBUILD_FLAGS := \
162 -Wno-unused-parameter -Wno-sign-compare 162 -Wno-unused-parameter -Wno-sign-compare
163 163
164# androideabi toolchain adds `pic` by default, disable it
165# for kernel module build
166KBUILD_FLAGS += -fno-pic
167
164TESTED_KBUILD_FLAGS := \ 168TESTED_KBUILD_FLAGS := \
165 $(call kernel-cc-option,-Wmissing-include-dirs) \ 169 $(call kernel-cc-option,-Wmissing-include-dirs) \
166 $(call kernel-cc-option,-Wno-type-limits) \ 170 $(call kernel-cc-option,-Wno-type-limits) \
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
index 68e8132..ba37064 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
@@ -245,8 +245,8 @@ PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAWxx := 1
245endif 245endif
246 246
247############################################################################## 247##############################################################################
248# Marshmallow onwards DDK stopped render script accleration using GPU. 248# Marshmallow onwards DDK stopped render script acceleration using GPU.
249# This flag stops device alloction. 249# This flag stops device allocation.
250# 250#
251ifeq ($(is_at_least_marshmallow),1) 251ifeq ($(is_at_least_marshmallow),1)
252PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1 252PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
index 046b8bb..23cce13 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
@@ -51,10 +51,6 @@ ifeq ($(TARGET_DEVICE),)
51override TARGET_DEVICE := jacinto6evm 51override TARGET_DEVICE := jacinto6evm
52endif 52endif
53 53
54ifeq ($(TARGET_DEVICE),)
55override TARGET_DEVICE := am57xevm
56endif
57
58# Customize this build as per the TARGET_DEVICE setting 54# Customize this build as per the TARGET_DEVICE setting
59# 55#
60ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),) 56ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),)
@@ -81,7 +77,7 @@ VS_PRODUCT_VERSION := 5
81# FIXME: Re-enable this ASAP 77# FIXME: Re-enable this ASAP
82SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 78SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
83endif 79endif
84ifneq ($(filter jacinto6evm am57xevm,$(TARGET_DEVICE)),) 80ifneq ($(filter jacinto6evm am57xxevm,$(TARGET_DEVICE)),)
85SGXCORE := 544 81SGXCORE := 544
86SGX_CORE_REV := 116 82SGX_CORE_REV := 116
87SGX_FEATURE_MP := 1 83SGX_FEATURE_MP := 1
@@ -98,9 +94,8 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
98 94
99endif 95endif
100 96
101ifneq ($(filter am57xevm,$(TARGET_DEVICE)),) 97ifneq ($(filter am57xxevm,$(TARGET_DEVICE)),)
102HAL_VARIANT := am57x 98HAL_VARIANT := am57xxevm
103
104endif 99endif
105 100
106# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs 101# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
diff --git a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
index d48838f..bc0d8cc 100644
--- a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
+++ b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
@@ -53,16 +53,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
53 53
54#define PVRVERSION_FAMILY "sgxddk" 54#define PVRVERSION_FAMILY "sgxddk"
55#define PVRVERSION_BRANCHNAME "1.14" 55#define PVRVERSION_BRANCHNAME "1.14"
56#define PVRVERSION_BUILD 4001660 56#define PVRVERSION_BUILD 4081762
57#define PVRVERSION_BSCONTROL "SGX_DDK_Linux_XOrg" 57#define PVRVERSION_BSCONTROL "SGX_DDK_Android"
58 58
59#define PVRVERSION_STRING "SGX_DDK_Linux_XOrg sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD) 59#define PVRVERSION_STRING "SGX_DDK_Android sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD)
60#define PVRVERSION_STRING_SHORT "1.14@" PVR_STR2(PVRVERSION_BUILD) "" 60#define PVRVERSION_STRING_SHORT "1.14@" PVR_STR2(PVRVERSION_BUILD) ""
61 61
62#define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved." 62#define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved."
63 63
64#define PVRVERSION_BUILD_HI 400 64#define PVRVERSION_BUILD_HI 408
65#define PVRVERSION_BUILD_LO 1660 65#define PVRVERSION_BUILD_LO 1762
66#define PVRVERSION_STRING_NUMERIC PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO) 66#define PVRVERSION_STRING_NUMERIC PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO)
67 67
68#endif /* _PVRVERSION_H_ */ 68#endif /* _PVRVERSION_H_ */
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
index bce7945..6ca6bc2 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
@@ -1100,6 +1100,7 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE hDeviceNode,
1100 IMG_UINT8 *pDst; 1100 IMG_UINT8 *pDst;
1101 PRESMAN_ITEM psResItem; 1101 PRESMAN_ITEM psResItem;
1102 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1102 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1103 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1103 1104
1104 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1105 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1105 sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP), 1106 sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP),
@@ -1135,6 +1136,16 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE hDeviceNode,
1135 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Couldn't allocate device memory for HW Render Context")); 1136 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Couldn't allocate device memory for HW Render Context"));
1136 goto exit1; 1137 goto exit1;
1137 } 1138 }
1139 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1140 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1141 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1142
1143 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWRenderContextMemInfo->pvLinAddrKM ||
1144 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32HWRenderContextSize)
1145 {
1146 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Offset of page directory device physical address is invalid"));
1147 goto exit2;
1148 }
1138 1149
1139 eError = OSCopyFromUser(psPerProc, 1150 eError = OSCopyFromUser(psPerProc,
1140 psCleanup->psHWRenderContextMemInfo->pvLinAddrKM, 1151 psCleanup->psHWRenderContextMemInfo->pvLinAddrKM,
@@ -1287,6 +1298,7 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE hDeviceNode,
1287 IMG_UINT8 *pDst; 1298 IMG_UINT8 *pDst;
1288 PRESMAN_ITEM psResItem; 1299 PRESMAN_ITEM psResItem;
1289 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1300 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1301 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1290 1302
1291 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1303 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1292 sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP), 1304 sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP),
@@ -1324,6 +1336,17 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE hDeviceNode,
1324 goto exit1; 1336 goto exit1;
1325 } 1337 }
1326 1338
1339 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1340 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1341 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1342
1343 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWTransferContextMemInfo->pvLinAddrKM ||
1344 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32HWTransferContextSize)
1345 {
1346 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
1347 goto exit2;
1348 }
1349
1327 eError = OSCopyFromUser(psPerProc, 1350 eError = OSCopyFromUser(psPerProc,
1328 psCleanup->psHWTransferContextMemInfo->pvLinAddrKM, 1351 psCleanup->psHWTransferContextMemInfo->pvLinAddrKM,
1329 psHWTransferContextCpuVAddr, 1352 psHWTransferContextCpuVAddr,
@@ -1628,6 +1651,7 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE hDeviceNode,
1628 IMG_UINT8 *pDst; 1651 IMG_UINT8 *pDst;
1629 PRESMAN_ITEM psResItem; 1652 PRESMAN_ITEM psResItem;
1630 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1653 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1654 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1631 1655
1632 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1656 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1633 sizeof(SGX_HW_2D_CONTEXT_CLEANUP), 1657 sizeof(SGX_HW_2D_CONTEXT_CLEANUP),
@@ -1664,6 +1688,17 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE hDeviceNode,
1664 goto exit1; 1688 goto exit1;
1665 } 1689 }
1666 1690
1691 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1692 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1693 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1694
1695 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHW2DContextMemInfo->pvLinAddrKM ||
1696 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32HW2DContextSize)
1697 {
1698 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
1699 goto exit2;
1700 }
1701
1667 eError = OSCopyFromUser(psPerProc, 1702 eError = OSCopyFromUser(psPerProc,
1668 psCleanup->psHW2DContextMemInfo->pvLinAddrKM, 1703 psCleanup->psHW2DContextMemInfo->pvLinAddrKM,
1669 psHW2DContextCpuVAddr, 1704 psHW2DContextCpuVAddr,
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
index e1e8868..7a827ce 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
@@ -43,9 +43,9 @@ ccflags-y += \
43 -I$(TOP)/tools/intern/debug/client 43 -I$(TOP)/tools/intern/debug/client
44 44
45dbgdrv-y += \ 45dbgdrv-y += \
46 tools/intern/debug/dbgdriv/common/dbgdriv_handle.o \
46 tools/intern/debug/dbgdriv/common/dbgdriv.o \ 47 tools/intern/debug/dbgdriv/common/dbgdriv.o \
47 tools/intern/debug/dbgdriv/common/ioctl.o \ 48 tools/intern/debug/dbgdriv/common/ioctl.o \
48 tools/intern/debug/dbgdriv/common/handle.o \
49 tools/intern/debug/dbgdriv/common/hotkey.o \ 49 tools/intern/debug/dbgdriv/common/hotkey.o \
50 tools/intern/debug/dbgdriv/linux/main.o \ 50 tools/intern/debug/dbgdriv/linux/main.o \
51 tools/intern/debug/dbgdriv/linux/hostfunc.o 51 tools/intern/debug/dbgdriv/linux/hostfunc.o
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c
index a9d37a6..a9d37a6 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c