diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2014-09-26 09:05:41 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:30 -0400 |
commit | 435cf045d7f856e90c9087403dfcbc2677a4575a (patch) | |
tree | 1378a3278920ea448e795d464c590f78c26b2cf7 /drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |
parent | 47298dae35d37effed55c2b46e420186114ff83c (diff) |
gpu: nvgpu: cde: check return values from busy
check gk20a_busy return value in cde converter code paths.
Bug 200040921
Change-Id: Ibad36df5877e325636a0a6ccc30c0d3d076ca941
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/540006
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index b196e330..53fab0d9 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -91,7 +91,10 @@ static int gk20a_ctrl_prepare_compressible_read( | |||
91 | fence.syncpt_id = args->fence.syncpt_id; | 91 | fence.syncpt_id = args->fence.syncpt_id; |
92 | fence.value = args->fence.syncpt_value; | 92 | fence.value = args->fence.syncpt_value; |
93 | 93 | ||
94 | gk20a_busy(g->dev); | 94 | ret = gk20a_busy(g->dev); |
95 | if (ret) | ||
96 | return ret; | ||
97 | |||
95 | ret = gk20a_prepare_compressible_read(g, args->handle, | 98 | ret = gk20a_prepare_compressible_read(g, args->handle, |
96 | args->request_compbits, args->offset, | 99 | args->request_compbits, args->offset, |
97 | args->compbits_hoffset, args->compbits_voffset, | 100 | args->compbits_hoffset, args->compbits_voffset, |
@@ -137,7 +140,9 @@ static int gk20a_ctrl_mark_compressible_write( | |||
137 | { | 140 | { |
138 | int ret = 0; | 141 | int ret = 0; |
139 | 142 | ||
140 | gk20a_busy(g->dev); | 143 | ret = gk20a_busy(g->dev); |
144 | if (ret) | ||
145 | return ret; | ||
141 | ret = gk20a_mark_compressible_write(g, args->handle, | 146 | ret = gk20a_mark_compressible_write(g, args->handle, |
142 | args->valid_compbits, args->offset, args->zbc_color); | 147 | args->valid_compbits, args->offset, args->zbc_color); |
143 | gk20a_idle(g->dev); | 148 | gk20a_idle(g->dev); |
@@ -249,8 +254,10 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg | |||
249 | } | 254 | } |
250 | 255 | ||
251 | if (!err) { | 256 | if (!err) { |
252 | gk20a_busy(dev); | 257 | err = gk20a_busy(dev); |
253 | err = gk20a_gr_zbc_set_table(g, &g->gr, zbc_val); | 258 | if (!err) |
259 | err = gk20a_gr_zbc_set_table(g, &g->gr, | ||
260 | zbc_val); | ||
254 | gk20a_idle(dev); | 261 | gk20a_idle(dev); |
255 | } | 262 | } |
256 | 263 | ||