From 435cf045d7f856e90c9087403dfcbc2677a4575a Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Fri, 26 Sep 2014 16:05:41 +0300 Subject: 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 Signed-off-by: Arto Merilainen Reviewed-on: http://git-master/r/540006 --- drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 3644c2ef..c2e2cc98 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c @@ -842,7 +842,9 @@ int gk20a_cde_reload(struct gk20a *g) int err, i; if (!cde_app->initialised) { - gk20a_busy(g->dev); + err = gk20a_busy(g->dev); + if (err) + return err; gk20a_init_cde_support(g); gk20a_idle(g->dev); if (!cde_app->initialised) @@ -850,7 +852,10 @@ int gk20a_cde_reload(struct gk20a *g) return 0; } - gk20a_busy(g->dev); + err = gk20a_busy(g->dev); + if (err) + return err; + mutex_lock(&cde_app->mutex); for (i = 0; i < ARRAY_SIZE(cde_app->cde_ctx); i++, cde_ctx++) { gk20a_cde_remove(cde_ctx); @@ -1043,7 +1048,9 @@ static int gk20a_buffer_convert_gpu_to_cde( WRITE_PATCH(PATCH_QMD_CTA_THREAD_DIMENSION2, 1); #undef WRITE_PATCH - gk20a_busy(g->dev); + err = gk20a_busy(g->dev); + if (err) + return err; err = gk20a_init_cde_support(g); if (err) goto out; -- cgit v1.2.2