diff options
author | Matt Pedro <mapedro@nvidia.com> | 2014-05-11 22:57:48 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:48 -0400 |
commit | 6c6936858af4902ca0e170da03ddf92e32b74ae1 (patch) | |
tree | afc541fd72773aa4676188684b9c92a67af60a09 /drivers/gpu/nvgpu/gk20a/as_gk20a.c | |
parent | a82f92e318005f1e42f803aec054ee3714f780f9 (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/as_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/as_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c index 42fa2167..ea0fb8f5 100644 --- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c | |||
@@ -231,7 +231,7 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
231 | return -EFAULT; | 231 | return -EFAULT; |
232 | } | 232 | } |
233 | 233 | ||
234 | err = gk20a_busy(g->dev); | 234 | err = gk20a_channel_busy(g->dev); |
235 | if (err) | 235 | if (err) |
236 | return err; | 236 | return err; |
237 | 237 | ||
@@ -288,7 +288,7 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
288 | break; | 288 | break; |
289 | } | 289 | } |
290 | 290 | ||
291 | gk20a_idle(g->dev); | 291 | gk20a_channel_idle(g->dev); |
292 | 292 | ||
293 | if ((err == 0) && (_IOC_DIR(cmd) & _IOC_READ)) | 293 | if ((err == 0) && (_IOC_DIR(cmd) & _IOC_READ)) |
294 | err = copy_to_user((void __user *)arg, buf, _IOC_SIZE(cmd)); | 294 | err = copy_to_user((void __user *)arg, buf, _IOC_SIZE(cmd)); |