diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2009-03-02 11:10:55 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-03-03 09:49:54 +1000 |
| commit | 171901d15deeef61aa8e1b0d0772404f39691b73 (patch) | |
| tree | 7b455223711f255c70ecc8ed43b2a64acdf3547d | |
| parent | 4d77c88e912e5eb9480432af09e950ca8995c253 (diff) | |
| download | op-kernel-dev-171901d15deeef61aa8e1b0d0772404f39691b73.zip op-kernel-dev-171901d15deeef61aa8e1b0d0772404f39691b73.tar.gz | |
drm: Wake up all lock waiters when the master disappears.
Currently only one waiter is woken up, leaving other waiters
hanging waiting for the DRM lock.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 72c667f..12715d3 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -420,7 +420,7 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map) dev->sigdata.lock = NULL; master->lock.hw_lock = NULL; /* SHM removed */ master->lock.file_priv = NULL; - wake_up_interruptible(&master->lock.lock_queue); + wake_up_interruptible_all(&master->lock.lock_queue); } break; case _DRM_AGP: diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 46bb923..7b251dd 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -151,7 +151,7 @@ static void drm_master_destroy(struct kref *kref) dev->sigdata.lock = NULL; master->lock.hw_lock = NULL; master->lock.file_priv = NULL; - wake_up_interruptible(&master->lock.lock_queue); + wake_up_interruptible_all(&master->lock.lock_queue); } drm_free(master, sizeof(*master), DRM_MEM_DRIVER); |
