Merge "Revert "msm: kgsl: Device mutex lock for kgsl_cancel_event""
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index 9adede8..060dbd2 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -1807,16 +1807,13 @@
list_for_each_entry_safe(event, tmp, &cancel_synclist, node) {
if (event->type == KGSL_CMD_SYNCPOINT_TYPE_TIMESTAMP) {
- struct kgsl_device *device = cmdbatch->device;
/*
* Timestamp events are guaranteed to signal
* when canceled
*/
- kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
- kgsl_cancel_event(device, event->context,
+ kgsl_cancel_event(cmdbatch->device, event->context,
event->timestamp, kgsl_cmdbatch_sync_func,
event);
- kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
} else if (event->type == KGSL_CMD_SYNCPOINT_TYPE_FENCE) {
/* Put events that are successfully canceled */
if (kgsl_sync_fence_async_cancel(event->handle))