diff options
author | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-15 16:11:46 +0800 |
---|---|---|
committer | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-15 16:11:46 +0800 |
commit | 028bc40a6d227cb553236588c43f35ad7ae2af97 (patch) | |
tree | 662944c4a76cecb58cb63da17d5ed9aac1b39914 /drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c | |
parent | f27d1ca8e35893191bb344bb461d9f5f20be5ae7 (diff) |
HEADER: MALI: rockchip: upgrade midgard DDK to r9p0-05rel0release-20161015
Change-Id: Ie46489734268edac2db7508ed6976fc8b72c2f06
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c')
-rw-r--r-- | drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c index d992989123e8..4bcde85f3ee1 100644 --- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2014-2015 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 @@ -74,10 +74,9 @@ void kbase_wait_write_flush(struct kbase_context *kctx) { u32 base_count = 0; - /* - * The caller must be holding onto the kctx or the call is from - * userspace. - */ + /* A suspend won't happen here, because we're in a syscall from a + * userspace thread */ + kbase_pm_context_active(kctx->kbdev); kbase_pm_request_gpu_cycle_counter(kctx->kbdev); |