diff options
| author | chenzhen <chenzhen@rock-chips.com> | 2017-01-12 17:18:47 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2017-01-13 11:56:19 +0800 |
| commit | 7f166ae12d17f9dd42874b5182f3ad0cf1e95ff2 (patch) | |
| tree | 0b5db41cd85d9ded8cd65da48eb12eb5d8eb3938 /drivers/gpu/arm/midgard/mali_kbase_gator_api.c | |
| parent | 09c649805149bfd8dab847a00cd85c19f87557fa (diff) | |
Revert "MALI: rockchip: upgrade midgard DDK to r14p0-01rel0"
This reverts commit d1637ff80953fd46692f923f3ee7b656fb917081.
Change-Id: Ib99bae99fe7246142bfa7369b8e79ebbfae1e736
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_kbase_gator_api.c')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_gator_api.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c index 3292fa95fddd..4af3e4815e95 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -41,6 +41,7 @@ const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) { const char * const *hardware_counters; struct kbase_device *kbdev; + uint32_t gpu_id; uint32_t product_id; uint32_t count; @@ -52,27 +53,25 @@ const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) if (!kbdev) return NULL; - product_id = kbdev->gpu_props.props.core_props.product_id; + gpu_id = kbdev->gpu_props.props.core_props.product_id; + product_id = gpu_id & GPU_ID_VERSION_PRODUCT_ID; + product_id >>= GPU_ID_VERSION_PRODUCT_ID_SHIFT; if (GPU_ID_IS_NEW_FORMAT(product_id)) { - switch (GPU_ID2_MODEL_MATCH_VALUE(product_id)) { + switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { case GPU_ID2_PRODUCT_TMIX: hardware_counters = hardware_counters_mali_tMIx; count = ARRAY_SIZE(hardware_counters_mali_tMIx); break; - case GPU_ID2_PRODUCT_THEX: - hardware_counters = hardware_counters_mali_tHEx; - count = ARRAY_SIZE(hardware_counters_mali_tHEx); - break; default: hardware_counters = NULL; count = 0; - dev_err(kbdev->dev, "Unrecognized product ID: %u\n", - product_id); + dev_err(kbdev->dev, "Unrecognized gpu ID: %u\n", + gpu_id); break; } } else { - switch (product_id) { + switch (gpu_id) { /* If we are using a Mali-T60x device */ case GPU_ID_PI_T60X: hardware_counters = hardware_counters_mali_t60x; @@ -116,8 +115,8 @@ const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) default: hardware_counters = NULL; count = 0; - dev_err(kbdev->dev, "Unrecognized product ID: %u\n", - product_id); + dev_err(kbdev->dev, "Unrecognized gpu ID: %u\n", + gpu_id); break; } } |