summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/overlay.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/tegra/dc/overlay.c')
-rw-r--r--drivers/video/tegra/dc/overlay.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/video/tegra/dc/overlay.c b/drivers/video/tegra/dc/overlay.c
index 1db1cb469b92..7879100be8e1 100644
--- a/drivers/video/tegra/dc/overlay.c
+++ b/drivers/video/tegra/dc/overlay.c
@@ -405,7 +405,7 @@ surf_err:
static void tegra_overlay_set_emc_freq(struct tegra_overlay_info *dev)
{
- unsigned long emc_freq = 0;
+ unsigned long new_rate;
int i;
struct tegra_dc_win *win;
struct tegra_dc_win *wins[DC_N_WINDOWS];
@@ -415,19 +415,13 @@ static void tegra_overlay_set_emc_freq(struct tegra_overlay_info *dev)
wins[i] = win;
}
- emc_freq = tegra_dc_get_bandwidth(wins, dev->dc->n_windows);
+ new_rate = tegra_dc_get_bandwidth(wins, dev->dc->n_windows);
+ new_rate = EMC_BW_TO_FREQ(new_rate);
- if (emc_freq > tegra_dc_get_default_emc_clk_rate(dev->dc)) {
- WARN_ONCE(emc_freq > tegra_dc_get_default_emc_clk_rate(dev->dc),
- "Overlay: calculated EMC bandwidth is %luHz greater "
- "than maximum allowed %luHz. Setting to max.\n",
- emc_freq,
- tegra_dc_get_default_emc_clk_rate(dev->dc));
+ if (tegra_dc_has_multiple_dc())
+ new_rate = ULONG_MAX;
- emc_freq = tegra_dc_get_default_emc_clk_rate(dev->dc);
- }
-
- clk_set_rate(dev->dc->emc_clk, emc_freq);
+ clk_set_rate(dev->dc->emc_clk, new_rate);
}
/* Overlay functions */