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/mali_kbase_config_defaults.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/mali_kbase_config_defaults.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_config_defaults.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h index 9b00cce9b2b3..bd48ed96e962 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2013-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2013-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 @@ -149,6 +149,11 @@ enum { #define DEFAULT_AWID_LIMIT KBASE_AID_32 /** + * Default setting for using alternative hardware counters. + */ +#define DEFAULT_ALTERNATIVE_HWC false + +/** * Default UMP device mapping. A UMP_DEVICE_<device>_SHIFT value which * defines which UMP device this GPU should be mapped to. */ @@ -216,12 +221,6 @@ enum { #define DEFAULT_JS_HARD_STOP_TICKS_DUMPING (15000) /* 1500s */ /* - * Default timeout for some software jobs, after which the software event wait - * jobs will be cancelled. - */ -#define DEFAULT_JS_SOFT_JOB_TIMEOUT ((u32)3000) /* 3s */ - -/* * Default minimum number of scheduling ticks before the GPU is reset to clear a * "stuck" job */ |