diff options
| author | Sidath Senanayake <sidaths@google.com> | 2016-11-09 14:53:08 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2016-11-09 14:53:08 +0100 |
| commit | 9232778c98af5ff85caca9e5cd37b963fb3196d5 (patch) | |
| tree | 9edd429dc765d69dc72ffce9d9598ba8e2a4cd0f /mali_kbase/mali_kbase_vinstr.c | |
| parent | 192bd796c27ac6eb9443af4b7e027294316f7c5b (diff) | |
| download | gpu-9232778c98af5ff85caca9e5cd37b963fb3196d5.tar.gz | |
Mali Bifrost DDK r2p0 KMD
Provenance:
6aec14e96 (collaborate/EAC/b_r2p0)
BX304L01B-BU-00000-r2p0-03rel0
BX304L06A-BU-00000-r2p0-03rel0
BX304X07X-BU-00000-r2p0-03bet0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ic7007d25551bd1478b491ec5a0fc9ecb400aa25d
Diffstat (limited to 'mali_kbase/mali_kbase_vinstr.c')
| -rw-r--r-- | mali_kbase/mali_kbase_vinstr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mali_kbase/mali_kbase_vinstr.c b/mali_kbase/mali_kbase_vinstr.c index bd6095f..3adb06d 100644 --- a/mali_kbase/mali_kbase_vinstr.c +++ b/mali_kbase/mali_kbase_vinstr.c @@ -29,6 +29,7 @@ #include <mali_kbase.h> #include <mali_kbase_hwaccess_instr.h> +#include <mali_kbase_hwaccess_jm.h> #include <mali_kbase_hwcnt_reader.h> #include <mali_kbase_mem_linux.h> #include <mali_kbase_tlstream.h> @@ -1636,11 +1637,9 @@ static int kbasep_vinstr_hwcnt_reader_mmap(struct file *filp, if (vma->vm_pgoff > (size >> PAGE_SHIFT)) return -EINVAL; - if (vm_size > size) - return -EINVAL; offset = vma->vm_pgoff << PAGE_SHIFT; - if ((vm_size + offset) > size) + if (vm_size > size - offset) return -EINVAL; addr = __pa((unsigned long)cli->dump_buffers + offset); @@ -1687,9 +1686,9 @@ static void kbasep_vinstr_kick_scheduler(struct kbase_device *kbdev) unsigned long flags; down(&js_devdata->schedule_sem); - spin_lock_irqsave(&js_devdata->runpool_irq.lock, flags); - kbase_jm_kick_all(kbdev); - spin_unlock_irqrestore(&js_devdata->runpool_irq.lock, flags); + spin_lock_irqsave(&kbdev->hwaccess_lock, flags); + kbase_backend_slot_update(kbdev); + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); up(&js_devdata->schedule_sem); } |