diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-08-01 13:38:22 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-08-03 09:29:34 +0000 |
| commit | dacf004cc8a4b35f5a0fb5fb67246f9cc8fdaafb (patch) | |
| tree | 07484dccba43bb2c2a07626c00154751f318bd47 /mali_kbase/mali_kbase_fence.h | |
| parent | bce5281a0408a175137c08dc93028e2a2c0fb69b (diff) | |
| download | gpu-dacf004cc8a4b35f5a0fb5fb67246f9cc8fdaafb.tar.gz | |
Update KMD to 'mini release: update r44p1-01bet1 to r44p1-00dev2'
Provenance: ipdelivery@d10c137c7691a470b8b33786aec4965315db4561
Change-Id: I4fbcc669d3b8e36c8288c91fdddd8b79258b6635
Diffstat (limited to 'mali_kbase/mali_kbase_fence.h')
| -rw-r--r-- | mali_kbase/mali_kbase_fence.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mali_kbase/mali_kbase_fence.h b/mali_kbase/mali_kbase_fence.h index f4507ac..ea2ac34 100644 --- a/mali_kbase/mali_kbase_fence.h +++ b/mali_kbase/mali_kbase_fence.h @@ -33,6 +33,7 @@ #include "mali_kbase_fence_defs.h" #include "mali_kbase.h" #include "mali_kbase_refcount_defs.h" +#include <linux/version_compat_defs.h> #if MALI_USE_CSF /* Maximum number of characters in DMA fence timeline name. */ @@ -160,16 +161,8 @@ static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom) static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom, int status) { - if (status) { -#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE && \ - KERNEL_VERSION(4, 9, 68) <= LINUX_VERSION_CODE) - fence_set_error(katom->dma_fence.fence, status); -#elif (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE) - dma_fence_set_error(katom->dma_fence.fence, status); -#else - katom->dma_fence.fence->status = status; -#endif - } + if (status) + dma_fence_set_error_helper(katom->dma_fence.fence, status); return dma_fence_signal(katom->dma_fence.fence); } |