summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
diff options
context:
space:
mode:
authorMatt Pedro <mapedro@nvidia.com>2014-05-11 22:57:48 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:48 -0400
commit6c6936858af4902ca0e170da03ddf92e32b74ae1 (patch)
treeafc541fd72773aa4676188684b9c92a67af60a09 /drivers/gpu/nvgpu/gk20a/gk20a.h
parenta82f92e318005f1e42f803aec054ee3714f780f9 (diff)
Revert "gpu: nvgpu: Keep host1x on when GPU on"
This reverts commit 20d48a759b032116e3092e1df76518065da59879. Change-Id: I93718a314b70ee9284a83ca69964883e670ad78d Signed-off-by: Matt Pedro <mapedro@nvidia.com> Reviewed-on: http://git-master/r/407969 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index fc488a28..13d385f5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -550,6 +550,8 @@ int clk_gk20a_debugfs_init(struct platform_device *dev);
550void gk20a_busy_noresume(struct platform_device *pdev); 550void gk20a_busy_noresume(struct platform_device *pdev);
551int gk20a_busy(struct platform_device *pdev); 551int gk20a_busy(struct platform_device *pdev);
552void gk20a_idle(struct platform_device *pdev); 552void gk20a_idle(struct platform_device *pdev);
553int gk20a_channel_busy(struct platform_device *pdev);
554void gk20a_channel_idle(struct platform_device *pdev);
553void gk20a_disable(struct gk20a *g, u32 units); 555void gk20a_disable(struct gk20a *g, u32 units);
554void gk20a_enable(struct gk20a *g, u32 units); 556void gk20a_enable(struct gk20a *g, u32 units);
555void gk20a_reset(struct gk20a *g, u32 units); 557void gk20a_reset(struct gk20a *g, u32 units);