Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171901d1 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

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: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 4d77c88e

drivers/gpu/drm/drm_bufs.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/gpu/drm/drm_stub.c

+1 −1
Original line number Diff line number Diff line
@@ -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);