summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2014-10-23 07:17:52 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:11:55 -0400
commit8c5b39353e7353b358c0da9d0de8691922e1179d (patch)
tree636e8bec07230737d5c5df525259fbde5af4e4bb /drivers/gpu/nvgpu/gk20a/gk20a.c
parent2d5ff668cbc6a932df2c9cf79627d1d340e5c2c0 (diff)
gpu: nvgpu: cde: move GK20A_CDE to platform data
CONFIG_GK20A_CDE has not even been used for enabling CDE, just for initializing it at boot time, and it was disabled; initialization has been done late when the engine is first used. Remove the config setting and add information about CDE support in gk20a platform data, forcing the initialization at boot time. Boot time init removes rare race conditions when CDE would be initialized by first user. Bug 200046882 Change-Id: I85d5fb73dc27acbbe203138d25f6e342de030d93 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: http://git-master/r/562855 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 226b5ae3..5dda7d74 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -798,6 +798,7 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
798{ 798{
799 struct platform_device *pdev = to_platform_device(dev); 799 struct platform_device *pdev = to_platform_device(dev);
800 struct gk20a *g = get_gk20a(pdev); 800 struct gk20a *g = get_gk20a(pdev);
801 struct gk20a_platform *platform = gk20a_get_platform(pdev);
801 int err, nice_value; 802 int err, nice_value;
802 803
803 gk20a_dbg_fn(""); 804 gk20a_dbg_fn("");
@@ -939,7 +940,7 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
939 940
940 trace_gk20a_finalize_poweron_done(dev_name(dev)); 941 trace_gk20a_finalize_poweron_done(dev_name(dev));
941 942
942 if (IS_ENABLED(CONFIG_GK20A_CDE)) 943 if (platform->has_cde)
943 gk20a_init_cde_support(g); 944 gk20a_init_cde_support(g);
944 945
945#ifdef CONFIG_INPUT_CFBOOST 946#ifdef CONFIG_INPUT_CFBOOST