From: Yoojin Park <yoojin1.park@samsung.com>
Date: Thu, 4 Jul 2019 14:18:39 +0000 (+0900)
Subject: [9610] drivers: gpu: remove BTS codes in Bifrost r19p0
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=850a2ab9d31a4d20050df34857e324b999c72057;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9610] drivers: gpu: remove BTS codes in Bifrost r19p0

To avoid buiid error

Change-Id: I9f68bcf381b81528341d34e959c2c33d3ba1b50c
Signed-off-by: Yoojin Park <yoojin1.park@samsung.com>
---

diff --git a/drivers/gpu/arm/b_r19p0/platform/exynos/gpu_dvfs_api.c b/drivers/gpu/arm/b_r19p0/platform/exynos/gpu_dvfs_api.c
index b021f785cc7e..65e0b499dd59 100644
--- a/drivers/gpu/arm/b_r19p0/platform/exynos/gpu_dvfs_api.c
+++ b/drivers/gpu/arm/b_r19p0/platform/exynos/gpu_dvfs_api.c
@@ -27,9 +27,6 @@
 #include "gpu_dvfs_handler.h"
 #include "gpu_dvfs_governor.h"
 
-#ifdef CONFIG_EXYNOS_BTS
-#include <soc/samsung/bts.h>
-#endif
 
 extern struct kbase_device *pkbdev;
 
@@ -155,15 +152,11 @@ int gpu_set_target_clk_vol(int clk, bool pending_is_allowed)
 #define BS_G3D_PERFORMANCE BS_G3D_PEFORMANCE
 #endif
 
-	/* MALI_SEC_INTEGRATION : for EXYNOS_BTS */
 	if (platform->gpu_bts_support) {
-		if (target_clk >= platform->mo_min_clock && !platform->is_set_bts) {
-			bts_add_scenario(platform->bts_scen_idx);
-			platform->is_set_bts = 1;
-		} else if (target_clk < platform->mo_min_clock && platform->is_set_bts) {
-			bts_del_scenario(platform->bts_scen_idx);
-			platform->is_set_bts = 0;
-		}
+		if (target_clk >= platform->mo_min_clock)
+			bts_update_scen(BS_G3D_PERFORMANCE, 1);	/* GPU IDQ : 0 (max token) */
+		else
+			bts_update_scen(BS_G3D_PERFORMANCE, 0);	/* GPU IDQ : 0x3 (default 12ea) */
 	}
 
 	mutex_unlock(&platform->gpu_clock_lock);
diff --git a/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.c b/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.c
index 8760b83f2b55..9c622baad679 100644
--- a/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.c
+++ b/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.c
@@ -44,9 +44,6 @@ static gpu_dvfs_info gpu_dvfs_table_default[DVFS_TABLE_ROW_MAX];
 
 #include <linux/of_platform.h>
 
-#ifdef CONFIG_EXYNOS_BTS
-#include <soc/samsung/bts.h>
-#endif
 
 struct kbase_device *pkbdev;
 static int gpu_debug_level;
@@ -327,10 +324,7 @@ static int gpu_dvfs_update_config_data_from_dt(struct kbase_device *kbdev)
 #endif
 	gpu_update_config_data_int(np, "gpu_runtime_pm_delay_time", &platform->runtime_pm_delay_time);
 
-#ifdef CONFIG_EXYNOS_BTS
 	gpu_update_config_data_int(np, "gpu_mo_min_clock", &platform->mo_min_clock);
-	platform->bts_scen_idx = bts_get_scenindex("g3d_performance");
-#endif
 
 	gpu_update_config_data_int(np, "gpu_boost_gpu_min_lock", &platform->boost_gpu_min_lock);
 	gpu_update_config_data_int(np, "gpu_boost_egl_min_lock", &platform->boost_egl_min_lock);
diff --git a/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.h b/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.h
index dbd8f18320b8..f02327109de7 100644
--- a/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.h
+++ b/drivers/gpu/arm/b_r19p0/platform/exynos/mali_kbase_platform.h
@@ -278,11 +278,7 @@ struct exynos_context {
 	int gpu_exception_count[GPU_EXCEPTION_LIST_END];
 	int balance_retry_count[BMAX_RETRY_CNT];
 	gpu_attribute *attrib;
-#ifdef CONFIG_EXYNOS_BTS
 	int mo_min_clock;
-	unsigned int bts_scen_idx;
-	unsigned int is_set_bts; // Check the pair of bts scenario.
-#endif
 	int *save_cpu_max_freq;
 
 	unsigned int g3d_cmu_cal_id;