summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2022-07-05 08:20:47 +0200
committerViresh Kumar <viresh.kumar@linaro.org>2022-07-12 17:05:20 +0200
commit274c3e83e7d9bf4361fd30648f5c9414c806135c (patch)
tree2e8fbff06b13fcb10afe20fc92fb1108e65c57f4
parentOPP: Allow multiple clocks for a device (diff)
downloadlinux-274c3e83e7d9bf4361fd30648f5c9414c806135c.tar.xz
linux-274c3e83e7d9bf4361fd30648f5c9414c806135c.zip
OPP: Compare bandwidths for all paths in _opp_compare_key()
Replicate the same behavior as "rates" here and compare all values instead of relying on the first entry alone. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-rw-r--r--drivers/opp/core.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index e3322d54942a..d695f68fba8c 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1697,6 +1697,20 @@ static int _opp_compare_rate(struct opp_table *opp_table,
return 0;
}
+static int _opp_compare_bw(struct opp_table *opp_table, struct dev_pm_opp *opp1,
+ struct dev_pm_opp *opp2)
+{
+ int i;
+
+ for (i = 0; i < opp_table->path_count; i++) {
+ if (opp1->bandwidth[i].peak != opp2->bandwidth[i].peak)
+ return opp1->bandwidth[i].peak < opp2->bandwidth[i].peak ? -1 : 1;
+ }
+
+ /* Same bw for both OPPs */
+ return 0;
+}
+
/*
* Returns
* 0: opp1 == opp2
@@ -1712,9 +1726,9 @@ int _opp_compare_key(struct opp_table *opp_table, struct dev_pm_opp *opp1,
if (ret)
return ret;
- if (opp1->bandwidth && opp2->bandwidth &&
- opp1->bandwidth[0].peak != opp2->bandwidth[0].peak)
- return opp1->bandwidth[0].peak < opp2->bandwidth[0].peak ? -1 : 1;
+ ret = _opp_compare_bw(opp_table, opp1, opp2);
+ if (ret)
+ return ret;
if (opp1->level != opp2->level)
return opp1->level < opp2->level ? -1 : 1;