summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-09-07 17:21:16 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-24 12:08:23 -0400
commit81660ab58ce695b79c94e145745512516c592afe (patch)
treeb297b9efa08c7d8718053689b9aefea50da75987 /drivers/gpu/nvgpu/gk20a/gk20a.c
parentfd02ab4d540ef473df1fe189653cc521876663d6 (diff)
gpu: nvgpu: Enable CE always
All GPUs have a copy engine. So delete the flag has_ce, because it's always true. JIRA NVGPU-16 Change-Id: I89db74c7cf66b24db84301b79832862ef28100b9 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1325355 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 59f16bf6..2046c08e 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -443,8 +443,7 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
443 /* cancel any pending cde work */ 443 /* cancel any pending cde work */
444 gk20a_cde_suspend(g); 444 gk20a_cde_suspend(g);
445 445
446 if (platform->has_ce) 446 gk20a_ce_suspend(g);
447 gk20a_ce_suspend(g);
448 447
449 ret = gk20a_channel_suspend(g); 448 ret = gk20a_channel_suspend(g);
450 if (ret) 449 if (ret)
@@ -710,8 +709,7 @@ int gk20a_pm_finalize_poweron(struct device *dev)
710 if (platform->has_cde) 709 if (platform->has_cde)
711 gk20a_init_cde_support(g); 710 gk20a_init_cde_support(g);
712 711
713 if (platform->has_ce) 712 gk20a_init_ce_support(g);
714 gk20a_init_ce_support(g);
715 713
716 gk20a_init_mm_ce_context(g); 714 gk20a_init_mm_ce_context(g);
717 715
@@ -1302,8 +1300,7 @@ static int __exit gk20a_remove(struct platform_device *pdev)
1302 if (g->remove_support) 1300 if (g->remove_support)
1303 g->remove_support(dev); 1301 g->remove_support(dev);
1304 1302
1305 if (platform->has_ce) 1303 gk20a_ce_destroy(g);
1306 gk20a_ce_destroy(g);
1307 1304
1308#ifdef CONFIG_ARCH_TEGRA_18x_SOC 1305#ifdef CONFIG_ARCH_TEGRA_18x_SOC
1309 nvgpu_clk_arb_cleanup_arbiter(g); 1306 nvgpu_clk_arb_cleanup_arbiter(g);