diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
| commit | 86ef494fcee7e40a37d17b101883d8beea42acf2 (patch) | |
| tree | 8ae28a633b3f5b2b117edef6138ae82571155312 /mali_kbase/mali_kbase_sync.h | |
| parent | ef7db1a858a7c156d6310d11d04efbaf7e216bf6 (diff) | |
| parent | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (diff) | |
| download | gpu-86ef494fcee7e40a37d17b101883d8beea42acf2.tar.gz | |
Merge r27p0 from upstream into android-gs-pixel-mainline
This commit updates the Mali KMD to version r27p0 from
commit 72f2457ff7355ff0389efe5bc9cec3365362d8c4
Bug: 171747612
Change-Id: Ida619c400a9652ebbbc871e2c973d3c78fc5de62
Diffstat (limited to 'mali_kbase/mali_kbase_sync.h')
| -rw-r--r-- | mali_kbase/mali_kbase_sync.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mali_kbase/mali_kbase_sync.h b/mali_kbase/mali_kbase_sync.h index 12ba073..3ea9b45 100644 --- a/mali_kbase/mali_kbase_sync.h +++ b/mali_kbase/mali_kbase_sync.h @@ -72,6 +72,7 @@ struct kbase_sync_fence_info { */ int kbase_sync_fence_stream_create(const char *name, int *const out_fd); +#if !MALI_USE_CSF /** * kbase_sync_fence_out_create Create an explicit output fence to specified atom * @katom: Atom to assign the new explicit fence to @@ -92,6 +93,7 @@ int kbase_sync_fence_out_create(struct kbase_jd_atom *katom, int stream_fd); * return: 0 on success, < 0 on error */ int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd); +#endif /* !MALI_USE_CSF */ /** * kbase_sync_fence_validate() - Validate a fd to be a valid fence @@ -104,6 +106,7 @@ int kbase_sync_fence_in_from_fd(struct kbase_jd_atom *katom, int fd); */ int kbase_sync_fence_validate(int fd); +#if !MALI_USE_CSF /** * kbase_sync_fence_out_trigger - Signal explicit output fence attached on katom * @katom: Atom with an explicit fence to signal @@ -154,6 +157,7 @@ void kbase_sync_fence_in_remove(struct kbase_jd_atom *katom); * This will also release the corresponding reference. */ void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom); +#endif /* !MALI_USE_CSF */ /** * kbase_sync_fence_close_fd() - Close a file descriptor representing a fence @@ -168,6 +172,7 @@ static inline void kbase_sync_fence_close_fd(int fd) #endif } +#if !MALI_USE_CSF /** * kbase_sync_fence_in_info_get() - Retrieves information about input fence * @katom: Atom to get fence information from @@ -187,6 +192,7 @@ int kbase_sync_fence_in_info_get(struct kbase_jd_atom *katom, */ int kbase_sync_fence_out_info_get(struct kbase_jd_atom *katom, struct kbase_sync_fence_info *info); +#endif /* !MALI_USE_CSF */ #if defined(CONFIG_SYNC_FILE) #if (KERNEL_VERSION(4, 10, 0) > LINUX_VERSION_CODE) @@ -207,6 +213,7 @@ void kbase_sync_fence_info_get(struct dma_fence *fence, const char *kbase_sync_status_string(int status); +#if !MALI_USE_CSF /* * Internal worker used to continue processing of atom. */ @@ -219,5 +226,6 @@ void kbase_sync_fence_wait_worker(struct kthread_work *data); */ void kbase_sync_fence_in_dump(struct kbase_jd_atom *katom); #endif +#endif /* !MALI_USE_CSF */ #endif /* MALI_KBASE_SYNC_H */ |