diff options
author | Vishal Mahaveer | 2015-08-28 15:10:30 -0500 |
---|---|---|
committer | Vishal Mahaveer | 2015-08-28 15:10:30 -0500 |
commit | 29bd91158e93bcde70c194be4dacc4af2c01c04c (patch) | |
tree | 7237d41755545593f066a215ae84641e7541d113 | |
parent | 07ee34f5be2623f08e9044db08e523a7d04b73b6 (diff) | |
download | device-ti-proprietary-open-29bd91158e93bcde70c194be4dacc4af2c01c04c.tar.gz device-ti-proprietary-open-29bd91158e93bcde70c194be4dacc4af2c01c04c.tar.xz device-ti-proprietary-open-29bd91158e93bcde70c194be4dacc4af2c01c04c.zip |
jacinto6: sgx-bin: sgx binaries and KM source update
Updating SGX binaries and Kernel module source of the latest DDK source.
Change-Id: Ib9f973a961b6d8dd78e98c2617270016399bc49e
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r-- | jacinto6/README.SGX | 2 | ||||
-rw-r--r-- | jacinto6/sgx.tgz | bin | 2706286 -> 2706542 bytes | |||
-rw-r--r-- | jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/dmabuf.c | 30 |
3 files changed, 29 insertions, 3 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX index 139d90c..e850111 100644 --- a/jacinto6/README.SGX +++ b/jacinto6/README.SGX | |||
@@ -16,7 +16,7 @@ sgx.tgz a set of binaries built for SGX544. | |||
16 | [DDK Version] | 16 | [DDK Version] |
17 | 1.12/2917986 | 17 | 1.12/2917986 |
18 | [DDK commit ID] | 18 | [DDK commit ID] |
19 | b26ac90 SGX-UM: EGL server wait fix. | 19 | 78cec7b sgx-km: check for dma_buf errors while importing them. |
20 | [Branch] | 20 | [Branch] |
21 | android/1.12/2917986_k3.14_L_gem | 21 | android/1.12/2917986_k3.14_L_gem |
22 | [Kernel modules built against] | 22 | [Kernel modules built against] |
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz index 2efbfc8..29e29af 100644 --- a/jacinto6/sgx.tgz +++ b/jacinto6/sgx.tgz | |||
Binary files differ | |||
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/dmabuf.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/dmabuf.c index 29c7d5d..4b9023e 100644 --- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/dmabuf.c +++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/dmabuf.c | |||
@@ -110,18 +110,44 @@ PVRSRV_ERROR DmabufImportBufferAndAcquirePhysAddr(IMG_UINT32 ui32NumFDs, | |||
110 | { | 110 | { |
111 | int fd = (int)pai32BufferFDs[i]; | 111 | int fd = (int)pai32BufferFDs[i]; |
112 | 112 | ||
113 | /* connect to the buffer */ | ||
113 | psImportData->apsDmaBuf[i] = dma_buf_get(fd); | 114 | psImportData->apsDmaBuf[i] = dma_buf_get(fd); |
114 | if (psImportData->apsDmaBuf[i] == IMG_NULL) | 115 | if (IS_ERR_OR_NULL(psImportData->apsDmaBuf[i])) |
115 | { | 116 | { |
117 | dev_err(&gpsPVRLDMDev->dev, | ||
118 | "dma_buf_get() returned bad dma_buf handle\n"); | ||
116 | eError = PVRSRV_ERROR_BAD_MAPPING; | 119 | eError = PVRSRV_ERROR_BAD_MAPPING; |
117 | goto exitFailImport; | 120 | goto exitFailImport; |
118 | } | 121 | } |
119 | 122 | ||
120 | psImportData->apsDmaBufAttachment[i] = dma_buf_attach(psImportData->apsDmaBuf[i], | 123 | psImportData->apsDmaBufAttachment[i] = dma_buf_attach(psImportData->apsDmaBuf[i], |
121 | &gpsPVRLDMDev->dev); | 124 | &gpsPVRLDMDev->dev); |
122 | 125 | if (IS_ERR_OR_NULL(psImportData->apsDmaBufAttachment[i])) | |
126 | { | ||
127 | dev_err(&gpsPVRLDMDev->dev, | ||
128 | "dma_buf_attach() returned bad attachment struct\n"); | ||
129 | eError = PVRSRV_ERROR_BAD_MAPPING; | ||
130 | goto exitFailImport; | ||
131 | } | ||
132 | |||
133 | /* requesting access to the buffer */ | ||
123 | psImportData->apsSgTable[i] = dma_buf_map_attachment(psImportData->apsDmaBufAttachment[i], | 134 | psImportData->apsSgTable[i] = dma_buf_map_attachment(psImportData->apsDmaBufAttachment[i], |
124 | DMA_BIDIRECTIONAL); | 135 | DMA_BIDIRECTIONAL); |
136 | if (IS_ERR_OR_NULL(psImportData->apsSgTable[i])) | ||
137 | { | ||
138 | dev_err(&gpsPVRLDMDev->dev, | ||
139 | "dma_buf_map_attachment returned stale sgtable: %d\n", | ||
140 | (int)psImportData->apsSgTable[i]); | ||
141 | #if defined(DEBUG) | ||
142 | /* lets dump the stack trace here */ | ||
143 | WARN_ON(true); | ||
144 | /* TODO: print all the current omap bo info */ | ||
145 | #endif | ||
146 | dma_buf_detach(psImportData->apsDmaBuf[i], | ||
147 | psImportData->apsDmaBufAttachment[i]); | ||
148 | eError = PVRSRV_ERROR_OUT_OF_MEMORY; | ||
149 | goto exitFailImport; | ||
150 | } | ||
125 | 151 | ||
126 | psScatterList[i] = psImportData->apsSgTable[i]->sgl; | 152 | psScatterList[i] = psImportData->apsSgTable[i]->sgl; |
127 | if (psScatterList[i] == NULL) | 153 | if (psScatterList[i] == NULL) |