diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-06-17 17:58:22 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-06-17 17:58:22 +0100 |
| commit | 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b (patch) | |
| tree | 8cd2a6a47f2a590ed7bed11afdcb9e52f7232c4f /mali_kbase/jm | |
| parent | fca8613cfcf585bf9113dca96a05daea9fd89794 (diff) | |
| download | gpu-2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b.tar.gz | |
Mali Valhall DDK r32p1 BETA KMD
Provenance: 59f633569 (collaborate/google/android/v_r32p1-00bet0)
VX504X08X-BU-00000-r32p1-00bet0 - Valhall Android DDK
VX504X08X-BU-60000-r32p1-00bet0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r32p1-00bet0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r32p1-00bet0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I6c9fc6e1e9f2e58bc804eb79582ad7afaafdef1b
Diffstat (limited to 'mali_kbase/jm')
| -rw-r--r-- | mali_kbase/jm/mali_kbase_jm_defs.h | 8 | ||||
| -rw-r--r-- | mali_kbase/jm/mali_kbase_js_defs.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mali_kbase/jm/mali_kbase_jm_defs.h b/mali_kbase/jm/mali_kbase_jm_defs.h index e4cb279..f16bd51 100644 --- a/mali_kbase/jm/mali_kbase_jm_defs.h +++ b/mali_kbase/jm/mali_kbase_jm_defs.h @@ -126,7 +126,7 @@ /* Reset the GPU after each atom completion */ #define KBASE_SERIALIZE_RESET (1 << 2) -#ifdef CONFIG_DEBUG_FS +#if IS_ENABLED(CONFIG_DEBUG_FS) /** * struct base_job_fault_event - keeps track of the atom which faulted or which * completed after the faulty atom but before the @@ -602,7 +602,7 @@ struct kbase_jd_atom { wait_queue_head_t completed; enum kbase_jd_atom_state status; -#ifdef CONFIG_GPU_TRACEPOINTS +#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) int work_id; #endif int slot_nr; @@ -627,7 +627,7 @@ struct kbase_jd_atom { u32 flush_id; -#ifdef CONFIG_DEBUG_FS +#if IS_ENABLED(CONFIG_DEBUG_FS) struct base_job_fault_event fault_event; #endif struct list_head queue; @@ -804,7 +804,7 @@ struct kbase_jd_context { u32 job_nr; size_t tb_wrap_offset; -#ifdef CONFIG_GPU_TRACEPOINTS +#if IS_ENABLED(CONFIG_GPU_TRACEPOINTS) atomic_t work_id; #endif diff --git a/mali_kbase/jm/mali_kbase_js_defs.h b/mali_kbase/jm/mali_kbase_js_defs.h index 183f0b0..095a042 100644 --- a/mali_kbase/jm/mali_kbase_js_defs.h +++ b/mali_kbase/jm/mali_kbase_js_defs.h @@ -37,8 +37,8 @@ typedef u32 kbase_context_flags; * typedef kbasep_js_ctx_job_cb - Callback function run on all of a context's * jobs registered with the Job Scheduler */ -typedef void (*kbasep_js_ctx_job_cb)(struct kbase_device *kbdev, - struct kbase_jd_atom *katom); +typedef void kbasep_js_ctx_job_cb(struct kbase_device *kbdev, + struct kbase_jd_atom *katom); /* * @brief Maximum number of jobs that can be submitted to a job slot whilst |