renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
Code

drm: fix regression in drm locking since BKL removal.

Browse Source 
This locking path needs proper auditing but probably too late for changes at this point for 2.6.36, so lets go with the quick fix, which is to drop the lock around schedule.

Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Arnd Bergmann 2010-08-27 08:55:28 +10:00 committed by Dave Airlie
parent 12acd90f0b
commit 08f2e669a8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_lock.c
View File

@ -92,7 +92,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
} }
/* Contention */ /* Contention */
mutex_unlock(&drm_global_mutex);
schedule(); schedule();
mutex_lock(&drm_global_mutex);
if (signal_pending(current)) { if (signal_pending(current)) {
ret = -EINTR; ret = -EINTR;
break; break;