diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-12-14 09:44:26 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-12-14 09:44:26 +0000 |
| commit | 049a542207ed694271316782397b78b2e202086a (patch) | |
| tree | 105e9378d4d5062dc72109fdd4a77c915bd9425d /mali_kbase/mali_kbase_fence.c | |
| parent | e61eb93296e9f940b32d4ad4b0c3a5557cbeaf17 (diff) | |
| download | gpu-049a542207ed694271316782397b78b2e202086a.tar.gz | |
Update KMD to r47p0
Provenance: ipdelivery@ad01e50d640910a99224382bb227e6d4de627657
Change-Id: I19ac9bce34a5c5a319c1b4a388e8b037b3dfe6e7
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; } - |