diff options
| author | Sidath Senanayake <sidaths@google.com> | 2018-04-27 13:23:04 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2018-04-27 13:23:04 +0200 |
| commit | 3fe808a3e4ba33fa6fc47255b6ec14611e8ef8de (patch) | |
| tree | 8a23baaae16dae4ca0431e002cb736a1034039c2 /mali_kbase/mali_kbase_jm.c | |
| parent | 8946bcdee4c36dbc82b8c2a2abcf9c2f5eab5ae0 (diff) | |
| download | gpu-3fe808a3e4ba33fa6fc47255b6ec14611e8ef8de.tar.gz | |
Mali Bifrost DDK r12p0 KMD
Provenance:
875d9aa9b (collaborate/EAC/b_r12p0)
BX304L01B-BU-00000-r12p0-01rel0
BX304L06A-BU-00000-r12p0-01rel0
BX304X07X-BU-00000-r12p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Id91cbb43f407e908f71a977fd139ea1e3a4f6b6f
Diffstat (limited to 'mali_kbase/mali_kbase_jm.c')
| -rw-r--r-- | mali_kbase/mali_kbase_jm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mali_kbase/mali_kbase_jm.c b/mali_kbase/mali_kbase_jm.c index 3b16e6f..da78a16 100644 --- a/mali_kbase/mali_kbase_jm.c +++ b/mali_kbase/mali_kbase_jm.c @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2014-2018 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 @@ -44,7 +44,7 @@ static bool kbase_jm_next_job(struct kbase_device *kbdev, int js, struct kbase_context *kctx; int i; - kctx = kbdev->hwaccess.active_kctx; + kctx = kbdev->hwaccess.active_kctx[js]; if (!kctx) return true; @@ -106,10 +106,14 @@ void kbase_jm_try_kick_all(struct kbase_device *kbdev) void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx) { + int js; + lockdep_assert_held(&kbdev->hwaccess_lock); - if (kbdev->hwaccess.active_kctx == kctx) - kbdev->hwaccess.active_kctx = NULL; + for (js = 0; js < BASE_JM_MAX_NR_SLOTS; js++) { + if (kbdev->hwaccess.active_kctx[js] == kctx) + kbdev->hwaccess.active_kctx[js] = NULL; + } } struct kbase_jd_atom *kbase_jm_return_atom_to_js(struct kbase_device *kbdev, |