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_gpu_id.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_gpu_id.h')
-rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_gpu_id.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h index a962ecb3f9c6..dc8af2d6e794 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2015-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 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 @@ -77,9 +77,8 @@ /* Helper macro to create a complete GPU_ID (new format) */ #define GPU_ID2_MAKE(arch_major, arch_minor, arch_rev, product_major, \ version_major, version_minor, version_status) \ - (GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev, \ - product_major) | \ - GPU_ID2_VERSION_MAKE(version_major, version_minor, \ + (GPU_ID2_PRODUCT_MAKE(arch_major, arch_minor, arch_rev) | \ + GPU_ID2_VERSION_MAKE(version_major, version_minor, \ version_status)) /* Helper macro to create a partial GPU_ID (new format) that identifies @@ -95,7 +94,6 @@ (((product_id) << GPU_ID2_PRODUCT_MAJOR_SHIFT) & \ GPU_ID2_PRODUCT_MODEL) -#define GPU_ID2_PRODUCT_TMIX GPU_ID2_MODEL_MAKE(6, 0) /* Values for GPU_ID_VERSION_STATUS field for PRODUCT_ID GPU_ID_PI_T60X */ #define GPU_ID_S_15DEV0 0x1 |