diff options
Diffstat (limited to 'dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h')
| -rw-r--r-- | dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h index 1419b59..1039e85 100644 --- a/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h +++ b/dvalin/kernel/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -1,11 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * - * (C) COPYRIGHT 2011-2016, 2018-2020 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2016, 2018-2021 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 * Foundation, and any use by you of this program is subject to the terms - * of such GNU licence. + * of such GNU license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,12 +17,8 @@ * along with this program; if not, you can access it online at * http://www.gnu.org/licenses/gpl-2.0.html. * - * SPDX-License-Identifier: GPL-2.0 - * */ - - /* * Job Manager backend-specific low-level APIs. */ @@ -34,7 +31,7 @@ #include <linux/atomic.h> #include <backend/gpu/mali_kbase_jm_rb.h> -#include <backend/gpu/mali_kbase_device_internal.h> +#include <device/mali_kbase_device.h> /** * kbase_job_submit_nolock() - Submit a job to a certain job-slot @@ -62,7 +59,7 @@ void kbase_job_submit_nolock(struct kbase_device *kbdev, void kbase_job_done_slot(struct kbase_device *kbdev, int s, u32 completion_code, u64 job_tail, ktime_t *end_timestamp); -#ifdef CONFIG_GPU_TRACEPOINTS +#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) static inline char *kbasep_make_job_slot_string(int js, char *js_string, size_t js_size) { @@ -71,11 +68,13 @@ static inline char *kbasep_make_job_slot_string(int js, char *js_string, } #endif +#if !MALI_USE_CSF static inline int kbasep_jm_is_js_free(struct kbase_device *kbdev, int js, struct kbase_context *kctx) { return !kbase_reg_read(kbdev, JOB_SLOT_REG(js, JS_COMMAND_NEXT)); } +#endif /** @@ -94,6 +93,7 @@ void kbase_job_hw_submit(struct kbase_device *kbdev, struct kbase_jd_atom *katom, int js); +#if !MALI_USE_CSF /** * kbasep_job_slot_soft_or_hard_stop_do_action() - Perform a soft or hard stop * on the specified atom @@ -112,6 +112,7 @@ void kbasep_job_slot_soft_or_hard_stop_do_action(struct kbase_device *kbdev, u32 action, base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); +#endif /* !MALI_USE_CSF */ /** * kbase_backend_soft_hard_stop_slot() - Soft or hard stop jobs on a given job |