diff options
| author | Sidath Senanayake <sidaths@google.com> | 2017-09-19 18:23:58 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2017-09-19 18:23:58 +0200 |
| commit | c19c62718d90e8efa4675528aae6ab6fde13a12f (patch) | |
| tree | 4601ada4314a2641b2ebdb7073198a5a406085f8 /mali_kbase/mali_kbase_sync_file.c | |
| parent | ea23e535ae857c92d45cb11bdd5dba7c27579726 (diff) | |
| download | gpu-c19c62718d90e8efa4675528aae6ab6fde13a12f.tar.gz | |
Mali Bifrost DDK r8p0 KMD
Provenance:
a0013c522 (collaborate/EAC/b_r8p0)
BX304L01B-BU-00000-r8p0-01rel0
BX304L06A-BU-00000-r8p0-01rel0
BX304X07X-BU-00000-r8p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Iab1f0fc8f3602409180629b210c624791be774c5
Diffstat (limited to 'mali_kbase/mali_kbase_sync_file.c')
| -rw-r--r-- | mali_kbase/mali_kbase_sync_file.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mali_kbase/mali_kbase_sync_file.c b/mali_kbase/mali_kbase_sync_file.c index 4e1621c..ef5b7ce 100644 --- a/mali_kbase/mali_kbase_sync_file.c +++ b/mali_kbase/mali_kbase_sync_file.c @@ -161,7 +161,11 @@ static void kbase_fence_wait_callback(struct dma_fence *fence, struct kbase_context *kctx = katom->kctx; /* Cancel atom if fence is erroneous */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) + if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error) +#else if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0) +#endif katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; if (kbase_fence_dep_count_dec_and_test(katom)) { @@ -273,8 +277,13 @@ static void kbase_sync_fence_info_get(struct dma_fence *fence, * 1 : signaled */ if (dma_fence_is_signaled(fence)) { - if (fence->status < 0) - info->status = fence->status; /* signaled with error */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) + int status = fence->error; +#else + int status = fence->status; +#endif + if (status < 0) + info->status = status; /* signaled with error */ else info->status = 1; /* signaled with success */ } else { |