diff options
Diffstat (limited to 'mali_kbase/mali_kbase_fence.c')
| -rw-r--r-- | mali_kbase/mali_kbase_fence.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/mali_kbase/mali_kbase_fence.c b/mali_kbase/mali_kbase_fence.c index b16b276..febf2fd 100644 --- a/mali_kbase/mali_kbase_fence.c +++ b/mali_kbase/mali_kbase_fence.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -25,22 +25,14 @@ #include <mali_kbase_fence.h> #include <mali_kbase.h> +#include <linux/version_compat_defs.h> + /* Spin lock protecting all Mali fences as fence->lock. */ static DEFINE_SPINLOCK(kbase_fence_lock); -#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) -struct fence * -kbase_fence_out_new(struct kbase_jd_atom *katom) -#else -struct dma_fence * -kbase_fence_out_new(struct kbase_jd_atom *katom) -#endif +struct dma_fence *kbase_fence_out_new(struct kbase_jd_atom *katom) { -#if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) - struct fence *fence; -#else struct dma_fence *fence; -#endif WARN_ON(katom->dma_fence.fence); @@ -48,14 +40,10 @@ kbase_fence_out_new(struct kbase_jd_atom *katom) if (!fence) return NULL; - dma_fence_init(fence, - &kbase_fence_ops, - &kbase_fence_lock, - katom->dma_fence.context, - atomic_inc_return(&katom->dma_fence.seqno)); + dma_fence_init(fence, &kbase_fence_ops, &kbase_fence_lock, katom->dma_fence.context, + (u64)atomic_inc_return(&katom->dma_fence.seqno)); katom->dma_fence.fence = fence; return fence; } - |