MALI: Allow kbase to cancel a lock before it is acquired

This is based on Ib42b8e5c8039fd5f900885f097418b87d9614225,
most of which has been integrated into the wk45 release but
this particular commit is to account for local changes to
KDS in this repo.

BUG=chrome-os-partner:12480
TEST=Boot snow

Change-Id: I2092f4ec50f300e325a2cc54967b62dcb040fbd5
Reviewed-on: https://gerrit.chromium.org/gerrit/38389
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
Tested-by: Anush Elangovan <anush@chromium.org>
Commit-Ready: Anush Elangovan <anush@chromium.org>

diff --git a/drivers/gpu/arm/t6xx/kbase/src/common/mali_kbase_jd.c b/drivers/gpu/arm/t6xx/kbase/src/common/mali_kbase_jd.c
index a3ab7a3d2404254c1bd29ee7b589065bfa0a6e28..223d83d58d56fbcbe57669797316005efec8fe7c 100644 (file)
--- a/drivers/gpu/arm/t6xx/kbase/src/common/mali_kbase_jd.c
+++ b/drivers/gpu/arm/t6xx/kbase/src/common/mali_kbase_jd.c
@@ -255,7 +255,7 @@ void kbase_jd_free_external_resources(kbase_jd_atom *katom)
                mutex_unlock(&jctx->lock);
 
                /* Release the kds resource or cancel if zapping */
-               kds_resource_set_release(&katom->kds_rset);
+               kds_resource_set_release_sync(&katom->kds_rset);
        }
 #endif /* CONFIG_KDS */
 }