From 27625718c4b2e400650885f8c892860c6c7434fd Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Wed, 13 Mar 2019 10:30:54 -0700 Subject: Revert "gpu: nvgpu: cache gpu clk rate" This reverts commit e9a6d179a42e ("gpu: nvgpu: cache gpu clk rate") - Real clock rate doesn't always equal clock rate requested by caller - call of clk_set_rate() and update of cached_rate are not atomic - Real root cause for Bug 2051688 is in bpmp and gboost design Bug 2538692 Change-Id: I9248e0c69e2271ed2d0070587db59afa6f8160f2 Signed-off-by: Peng Liu Reviewed-on: https://git-master.nvidia.com/r/2109708 (cherry picked from commit cc70f89bb4efd106b81c2da5ecd6cbeb69c990d8) Reviewed-on: https://git-master.nvidia.com/r/2113647 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Aaron Tian Tested-by: Aaron Tian Reviewed-by: Bibek Basu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/clk_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index d84e5969..03aa6ab7 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011 - 2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -96,9 +96,6 @@ struct clk_gk20a { #if defined(CONFIG_COMMON_CLK) struct clk *tegra_clk; struct clk_hw hw; - - /* scaling rate */ - unsigned long cached_rate; #endif struct pll gpc_pll; struct pll gpc_pll_last; -- cgit v1.2.2