summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Zheng <simon.zheng@amlogic.com>2017-07-21 00:33:33 -0700
committerGerrit Code Review <gituser@scgit.amlogic.com>2017-07-21 00:33:33 -0700
commit085c87ed784b39f21ca08619b4f529f80c1f85ce (patch)
tree2d5ee169721705091b86dd2601d7ab7ce95c3de8
parentc9623769c934c07d5cd2e41652b0090ed26b4e52 (diff)
parentaa24277fc14853224d4a4e7a4473276dec813425 (diff)
downloadmali-driver-085c87ed784b39f21ca08619b4f529f80c1f85ce.tar.gz
Merge "gpu: fixed min_state of thermal" into r6p1
-rw-r--r--utgard/platform/meson_m450/platform_m8.c14
-rw-r--r--utgard/platform/meson_m450/platform_m8b.c15
2 files changed, 17 insertions, 12 deletions
diff --git a/utgard/platform/meson_m450/platform_m8.c b/utgard/platform/meson_m450/platform_m8.c
index d92fda2..66a4e25 100644
--- a/utgard/platform/meson_m450/platform_m8.c
+++ b/utgard/platform/meson_m450/platform_m8.c
@@ -153,13 +153,15 @@ int get_mali_freq_level(int freq)
mali_freq_num = mali_plat_data.dvfs_table_size - 1;
if (freq < mali_plat_data.clk_sample[0])
level = mali_freq_num-1;
- if (freq >= mali_plat_data.clk_sample[mali_freq_num - 1])
+ else if (freq >= mali_plat_data.clk_sample[mali_freq_num - 1])
level = 0;
- for (i=0; i<mali_freq_num - 1 ;i++) {
- if (freq >= mali_plat_data.clk_sample[i] && freq < mali_plat_data.clk_sample[i + 1]) {
- level = i;
- level = mali_freq_num-level - 1;
- break;
+ else {
+ for (i=0; i<mali_freq_num - 1 ;i++) {
+ if (freq >= mali_plat_data.clk_sample[i] && freq < mali_plat_data.clk_sample[i + 1]) {
+ level = i;
+ level = mali_freq_num-level - 1;
+ break;
+ }
}
}
return level;
diff --git a/utgard/platform/meson_m450/platform_m8b.c b/utgard/platform/meson_m450/platform_m8b.c
index 803498d..692aafe 100644
--- a/utgard/platform/meson_m450/platform_m8b.c
+++ b/utgard/platform/meson_m450/platform_m8b.c
@@ -147,16 +147,19 @@ int get_mali_freq_level(int freq)
if (freq < 0)
return level;
+
mali_freq_num = mali_plat_data.dvfs_table_size - 1;
if (freq < mali_plat_data.clk_sample[0])
level = mali_freq_num-1;
- if (freq >= mali_plat_data.clk_sample[mali_freq_num - 1])
+ else if (freq >= mali_plat_data.clk_sample[mali_freq_num - 1])
level = 0;
- for (i=0; i<mali_freq_num - 1 ;i++) {
- if (freq >= mali_plat_data.clk_sample[i] && freq < mali_plat_data.clk_sample[i + 1]) {
- level = i;
- level = mali_freq_num-level - 1;
- break;
+ else {
+ for (i=0; i<mali_freq_num - 1 ;i++) {
+ if (freq >= mali_plat_data.clk_sample[i] && freq < mali_plat_data.clk_sample[i + 1]) {
+ level = i;
+ level = mali_freq_num-level - 1;
+ break;
+ }
}
}
return level;