summaryrefslogtreecommitdiff
path: root/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c
diff options
context:
space:
mode:
authorJacob Chen <jacob2.chen@rock-chips.com>2016-10-11 15:41:30 +0800
committerJacob Chen <jacob2.chen@rock-chips.com>2016-10-11 15:41:30 +0800
commitcde3c3fdf278bbf3edc895667a65c0cc16daee0c (patch)
tree32ae79e06d11d677cee0318e2ef5b990d0cbe88e /drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c
parentf27d1ca8e35893191bb344bb461d9f5f20be5ae7 (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_gpuprops_backend.c')
-rw-r--r--drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c
index d410cd297889..705b1ebfa87f 100644
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.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
@@ -86,20 +86,8 @@ void kbase_backend_gpuprops_get(struct kbase_device *kbdev,
void kbase_backend_gpuprops_get_features(struct kbase_device *kbdev,
struct kbase_gpuprops_regdump *regdump)
{
- if (kbase_hw_has_feature(kbdev, BASE_HW_FEATURE_COHERENCY_REG)) {
- /* Ensure we can access the GPU registers */
- kbase_pm_register_access_enable(kbdev);
-
- regdump->coherency_features = kbase_reg_read(kbdev,
- GPU_CONTROL_REG(COHERENCY_FEATURES), NULL);
-
- /* We're done accessing the GPU registers for now. */
- kbase_pm_register_access_disable(kbdev);
- } else {
- /* Pre COHERENCY_FEATURES we only supported ACE_LITE */
regdump->coherency_features =
COHERENCY_FEATURE_BIT(COHERENCY_NONE) |
COHERENCY_FEATURE_BIT(COHERENCY_ACE_LITE);
- }
}