diff options
| author | chenzhen <chenzhen@rock-chips.com> | 2016-10-17 19:38:36 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2017-02-20 14:27:24 +0800 |
| commit | 3054c50dd886faa349ca38c9ad8c2162f9706d5a (patch) | |
| tree | 75bb90efbf0cee54e590835e41c2c55087548c74 /drivers/gpu/arm/midgard/mali_kbase_gator_api.c | |
| parent | a90cb0ed3e287c16785f2da19ed122f40dc1a7ef (diff) | |
MALI: rockchip: upgrade midgard DDK to r14p0-01rel0
Along with a slight modification in mali_kbase_core_linux.c,
for building in rk Linux 4.4:
-#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE
+#if KERNEL_VERSION(4, 4, 0) > LINUX_VERSION_CODE
Change-Id: I34565cb975866b46c5e3a4d8e2ac5e350dcceb80
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, 11 insertions, 10 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c index 4af3e4815e95..3292fa95fddd 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -41,7 +41,6 @@ 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; @@ -53,25 +52,27 @@ const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) if (!kbdev) return NULL; - 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; + product_id = kbdev->gpu_props.props.core_props.product_id; if (GPU_ID_IS_NEW_FORMAT(product_id)) { - switch (gpu_id & GPU_ID2_PRODUCT_MODEL) { + switch (GPU_ID2_MODEL_MATCH_VALUE(product_id)) { 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 gpu ID: %u\n", - gpu_id); + dev_err(kbdev->dev, "Unrecognized product ID: %u\n", + product_id); break; } } else { - switch (gpu_id) { + switch (product_id) { /* If we are using a Mali-T60x device */ case GPU_ID_PI_T60X: hardware_counters = hardware_counters_mali_t60x; @@ -115,8 +116,8 @@ const char * const *kbase_gator_hwcnt_init_names(uint32_t *total_counters) default: hardware_counters = NULL; count = 0; - dev_err(kbdev->dev, "Unrecognized gpu ID: %u\n", - gpu_id); + dev_err(kbdev->dev, "Unrecognized product ID: %u\n", + product_id); break; } } |