From 21f1396d1c80010470e0f071fabe84279b3aebae Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 1 Apr 2015 11:18:10 +0300 Subject: gpu: nvgpu: don't idle if busy fail in set zbc tbl Move gk20a_idle() under error check in NVGPU_GPU_IOCTL_ZBC_SET_TABLE so that if gk20a_busy fails, the idle is skipped properly. Change-Id: Iffde3734f7fb121e1bc7838a67bfee3dacfd0a46 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/726104 Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index 7c4ec108..5b43eb4b 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c @@ -620,10 +620,11 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg if (!err) { err = gk20a_busy(dev); - if (!err) + if (!err) { err = gk20a_gr_zbc_set_table(g, &g->gr, zbc_val); - gk20a_idle(dev); + gk20a_idle(dev); + } } if (zbc_val) -- cgit v1.2.2