MALI: utgard: upgrade DDK to r7p0-00rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / mali400 / mali / platform / rk30 / rk3066.c

diff --git a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
index 5eda6aa32cfef1178bc14cd38890b93a424f6139..91556e25e8660938a9776022c992ead091f8b74b 100644 (file)
--- a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
+++ b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c
@@ -21,23 +21,24 @@
  *     .DP : common_parts : ARM 实现的通用的部分.
  */
 
-/* #define ENABLE_DEBUG_LOG */
+#define ENABLE_DEBUG_LOG
 #include "custom_log.h"
 
 #include <linux/platform_device.h>
 #include <linux/version.h>
 #include <linux/pm.h>
+#include <linux/of.h>
 #ifdef CONFIG_PM_RUNTIME
 #include <linux/pm_runtime.h>
 #endif
 #include <linux/workqueue.h>
 #include <linux/dma-mapping.h>
+#include <linux/pm_runtime.h>
 #include <linux/rockchip/cpu.h>
 
 #include <linux/mali/mali_utgard.h>
 #include "mali_kernel_common.h"
 #include "mali_platform.h"
-#include "arm_core_scaling.h"
 
 #ifdef CONFIG_PM_RUNTIME
 static int mali_runtime_suspend(struct device *device)
@@ -192,7 +193,7 @@ static const struct mali_gpu_device_data mali_gpu_data = {
        .shared_mem_size = 1024 * 1024 * 1024, /* 1GB */
        .fb_start = 0x40000000,
        .fb_size = 0xb1000000,
-       .max_job_runtime = 60000, /* 60 seconds */
+       .max_job_runtime = 100, /* 100 ms */
        /* .utilization_interval = 0, */ /* 0ms */
        .utilization_callback = mali_gpu_utilization_handler,
 };
@@ -218,26 +219,14 @@ static void mali_platform_device_add_config(struct platform_device *pdev)
 int mali_platform_device_init(struct platform_device *pdev)
 {
        int err = 0;
-       int num_pp_cores = 0;
-
-       MALI_DEBUG_PRINT(2, ("mali_platform_device_register() called\n"));
-
-       if (cpu_is_rk312x())
-               num_pp_cores = 2;
-       else if (cpu_is_rk3036())
-               num_pp_cores = 1;
-       else if (cpu_is_rk3188())
-               num_pp_cores = 4;
-       else if (cpu_is_rk3228())
-               num_pp_cores = 2;
-
-       mali_platform_device_add_config(pdev);
 
+       D("to add data to platform_device..");
        /* 将 platform_specific_data 添加到 platform_device_of_mali_gpu.
         * 这里的 platform_specific_data 的类型由 common_part 定义. */
        err = platform_device_add_data(pdev, &mali_gpu_data,
                                       sizeof(mali_gpu_data));
        if (err == 0) {
+               D("to init internal_platform_specific_code.");
                /* .KP : 初始化 platform_device_of_mali_gpu 中,
                 * 仅和 platform_dependent_part 相关的部分. */
                err = mali_platform_init(pdev);
@@ -247,8 +236,6 @@ int mali_platform_device_init(struct platform_device *pdev)
                        pm_runtime_use_autosuspend(&(pdev->dev));
                        pm_runtime_enable(&(pdev->dev));
 #endif
-                       MALI_DEBUG_ASSERT(0 < num_pp_cores);
-                       mali_core_scaling_init(num_pp_cores);
                        return 0;
                }
        }