diff options
| author | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-11 15:41:30 +0800 |
|---|---|---|
| committer | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-11 15:41:30 +0800 |
| commit | cde3c3fdf278bbf3edc895667a65c0cc16daee0c (patch) | |
| tree | 32ae79e06d11d677cee0318e2ef5b990d0cbe88e /drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h | |
| parent | f27d1ca8e35893191bb344bb461d9f5f20be5ae7 (diff) | |
MALI: rockchip: upgrade midgard DDK to r9p0-05rel0release-20161011
Change-Id: Ie46489734268edac2db7508ed6976fc8b72c2f06
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h index 83d477898c5e..8ccc440171a2 100644 --- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -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 @@ -71,7 +71,6 @@ struct slot_rb { * @reset_work: Work item for performing the reset * @reset_wait: Wait event signalled when the reset is complete * @reset_timer: Timeout for soft-stops before the reset - * @timeouts_updated: Have timeout values just been updated? * * The kbasep_js_device_data::runpool_irq::lock (a spinlock) must be held when * accessing this structure @@ -98,15 +97,11 @@ struct kbase_backend_data { /* The GPU reset process is currently occuring (timeout has expired or * kbasep_try_reset_gpu_early was called) */ #define KBASE_RESET_GPU_HAPPENING 3 -/* Reset the GPU silently, used when resetting the GPU as part of normal - * behavior (e.g. when exiting protected mode). */ -#define KBASE_RESET_GPU_SILENT 4 + struct workqueue_struct *reset_workq; struct work_struct reset_work; wait_queue_head_t reset_wait; struct hrtimer reset_timer; - - bool timeouts_updated; }; /** |