diff options
| author | Gowtham Tammana <g-tammana@ti.com> | 2019-04-09 15:53:14 -0500 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2019-04-11 13:01:08 -0500 |
| commit | 2a90a89ca6480b6c4355117f150fbfe199f11fe3 (patch) | |
| tree | cdd348e9988aec7c87265caff1b4b299bc2d4761 | |
| parent | a09f35d31bc386ab61e7a5dfdc1cadf2bf907722 (diff) | |
| download | proprietary-open-d-oreo-mr1-release.tar.gz | |
jacinto6: sgx_km: update to latest sourced-oreo-mr1-release
Contains below commits from DDK:
km: Fix loop index reset in nested loop
km: Fix out of bound access in loop macro
Change-Id: I741dc3774244170564a93ea7c3af1d8300a59243
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| -rw-r--r-- | jacinto6/README.SGX | 2 | ||||
| -rw-r--r-- | jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_sync.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX index 13c350c..98b8623 100644 --- a/jacinto6/README.SGX +++ b/jacinto6/README.SGX @@ -16,7 +16,7 @@ sgx.tgz a set of binaries built for SGX544. [DDK Version] 6AO.1.1.16-7535f9f [DDK commit ID] -7535f9f4 Merge pull request #89 in GRAPHICS/img-ddk-linux-android +14517da8 Merge pull request #91 in GRAPHICS/img-ddk-linux-android [Branch] android/1.17/494897_k4.4_O [Kernel modules built against] diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_sync.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_sync.c index 084df70..6b7fec9 100644 --- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_sync.c +++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_sync.c @@ -83,9 +83,11 @@ list_for_each_entry((s), &(f)->pt_list_head, pt_list) #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)) */ #define for_each_sync_pt(s, f, c) \ - for ((c) = 0, (s) = (struct sync_pt *)(f)->cbs[0].sync_pt; \ - (c) < (f)->num_fences; \ - (c)++, (s) = (struct sync_pt *)(f)->cbs[c].sync_pt) + for ((c) = 0, (s) = (f)->num_fences == 0 ? \ + NULL : (struct sync_pt *)(f)->cbs[0].sync_pt; \ + (c) < (f)->num_fences; \ + (c)++, (s) = (c) < (f)->num_fences ? \ + (struct sync_pt *)(f)->cbs[c].sync_pt : NULL) #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)) */ @@ -1383,7 +1385,7 @@ ExpandAndDeDuplicateFenceSyncs(IMG_UINT32 ui32NumSyncs, IMG_UINT32 *pui32NumRealSyncs, PVRSRV_KERNEL_SYNC_INFO *apsSyncInfo[]) { - IMG_UINT32 i, j, ui32FenceIndex = 0; + IMG_UINT32 i, j, ui32FenceIndex = 0, k; IMG_BOOL bRet = IMG_TRUE; struct sync_pt *psPt; @@ -1453,7 +1455,7 @@ ExpandAndDeDuplicateFenceSyncs(IMG_UINT32 ui32NumSyncs, /* FIXME: The ForeignSyncPointToSyncInfo() path optimizes away already * signalled fences. Consider optimizing this path too. */ - for_each_sync_pt(psPt, apsFence[ui32FenceIndex], j) + for_each_sync_pt(psPt, apsFence[ui32FenceIndex], k) { psSyncInfo = |