diff options
| author | Jack Diver <diverj@google.com> | 2022-09-02 11:38:04 +0000 |
|---|---|---|
| committer | Jack Diver <diverj@google.com> | 2022-09-02 14:33:02 +0000 |
| commit | c30533582604fe0365bc3ce4e9e8e19dec3109da (patch) | |
| tree | 2dc4d074c820b535e9f18b8cd81d7e91bff042e5 /mali_kbase/mali_kbase_vinstr.c | |
| parent | 88d7d984fed1c2a4358ce2bbc334e82d71e3a391 (diff) | |
| download | gpu-c30533582604fe0365bc3ce4e9e8e19dec3109da.tar.gz | |
Mali Valhall Android DDK r38p1-01eac0
VX504X08X-BU-00000-r38p1-01eac0 - Valhall Android DDK
VX504X08X-BU-60000-r38p1-01eac0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r38p1-01eac0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r38p1-01eac0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Jack Diver <diverj@google.com>
Change-Id: I242060ad8ddc14475bda657cbbbe6b6c26ecfd57
Diffstat (limited to 'mali_kbase/mali_kbase_vinstr.c')
| -rw-r--r-- | mali_kbase/mali_kbase_vinstr.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mali_kbase/mali_kbase_vinstr.c b/mali_kbase/mali_kbase_vinstr.c index d7a6c98..e9f843b 100644 --- a/mali_kbase/mali_kbase_vinstr.c +++ b/mali_kbase/mali_kbase_vinstr.c @@ -38,6 +38,7 @@ #include <linux/mutex.h> #include <linux/poll.h> #include <linux/slab.h> +#include <linux/version_compat_defs.h> #include <linux/workqueue.h> /* Hwcnt reader API version */ @@ -113,9 +114,7 @@ struct kbase_vinstr_client { wait_queue_head_t waitq; }; -static unsigned int kbasep_vinstr_hwcnt_reader_poll( - struct file *filp, - poll_table *wait); +static __poll_t kbasep_vinstr_hwcnt_reader_poll(struct file *filp, poll_table *wait); static long kbasep_vinstr_hwcnt_reader_ioctl( struct file *filp, @@ -517,8 +516,6 @@ void kbase_vinstr_term(struct kbase_vinstr_context *vctx) if (!vctx) return; - cancel_work_sync(&vctx->dump_work); - /* Non-zero client count implies client leak */ if (WARN_ON(vctx->client_count != 0)) { struct kbase_vinstr_client *pos, *n; @@ -530,6 +527,7 @@ void kbase_vinstr_term(struct kbase_vinstr_context *vctx) } } + cancel_work_sync(&vctx->dump_work); kbase_hwcnt_gpu_metadata_narrow_destroy(vctx->metadata_user); WARN_ON(vctx->client_count != 0); @@ -1039,18 +1037,16 @@ static long kbasep_vinstr_hwcnt_reader_ioctl( * Return: POLLIN if data can be read without blocking, 0 if data can not be * read without blocking, else error code. */ -static unsigned int kbasep_vinstr_hwcnt_reader_poll( - struct file *filp, - poll_table *wait) +static __poll_t kbasep_vinstr_hwcnt_reader_poll(struct file *filp, poll_table *wait) { struct kbase_vinstr_client *cli; if (!filp || !wait) - return -EINVAL; + return (__poll_t)-EINVAL; cli = filp->private_data; if (!cli) - return -EINVAL; + return (__poll_t)-EINVAL; poll_wait(filp, &cli->waitq, wait); if (kbasep_vinstr_hwcnt_reader_buffer_ready(cli)) |