projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
drm_lock.c
diff --git
a/drivers/gpu/drm/drm_lock.c
b/drivers/gpu/drm/drm_lock.c
index e2f70a516c34412112078131203309c3656622d7..9bf93bc9a32c27798791684ab73512a046e92a9c 100644
(file)
--- a/
drivers/gpu/drm/drm_lock.c
+++ b/
drivers/gpu/drm/drm_lock.c
@@
-92,7
+92,9
@@
int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
}
/* Contention */
+ mutex_unlock(&drm_global_mutex);
schedule();
+ mutex_lock(&drm_global_mutex);
if (signal_pending(current)) {
ret = -EINTR;
break;