From 0bce5edd9255d060f0a12a627097b31c5de55a55 Mon Sep 17 00:00:00 2001 From: Srikar Srimath Tirumala Date: Wed, 4 Jan 2017 14:43:01 -0800 Subject: Revert "gpu: nvgpu: fix round_rate ops for CCF" This reverts commit 34d8421ab4e9ecd0af09f7fefe71b9a1d8781061. Bug 200233943 Change-Id: Id03b7922c955d252aff54e6bbd8163926bdc65fb Signed-off-by: Srikar Srimath Tirumala Reviewed-on: http://git-master/r/1280828 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_common.c | 12 ------------ drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 ---- 2 files changed, 16 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/clk/clk_common.c b/drivers/gpu/nvgpu/clk/clk_common.c index 529efa15..346ad12b 100644 --- a/drivers/gpu/nvgpu/clk/clk_common.c +++ b/drivers/gpu/nvgpu/clk/clk_common.c @@ -45,7 +45,6 @@ unsigned long gk20a_clk_get_rate(struct gk20a *g) return rate_gpc2clk_to_gpu(clk->gpc_pll.freq); } -#ifdef CONFIG_TEGRA_CLK_FRAMEWORK long gk20a_clk_round_rate(struct gk20a *g, unsigned long rate) { /* make sure the clock is available */ @@ -55,17 +54,6 @@ long gk20a_clk_round_rate(struct gk20a *g, unsigned long rate) return clk_round_rate(clk_get_parent(g->clk.tegra_clk), rate); } -#else -long gk20a_clk_round_rate(struct gk20a *g, unsigned long rate) -{ - /* make sure the clock is available */ - if (!gk20a_clk_get(g)) - return rate; - - return clk_round_rate(g->clk.tegra_clk, rate); -} -#endif - int gk20a_clk_set_rate(struct gk20a *g, unsigned long rate) { return clk_set_rate(g->clk.tegra_clk, rate); diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index be194228..e4691588 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c @@ -1264,12 +1264,8 @@ static long gm20b_round_rate(struct clk_hw *hw, unsigned long rate, { struct clk_gk20a *clk = to_clk_gk20a(hw); u32 freq, old_freq; - unsigned long maxrate; struct pll tmp_pll; - maxrate = tegra_dvfs_get_maxrate(hw->clk); - gpc_pll_params.max_freq = rate_gpu_to_gpc2clk(maxrate); - mutex_lock(&clk->clk_mutex); old_freq = clk->gpc_pll.freq; freq = rate_gpu_to_gpc2clk(rate); -- cgit v1.2.2