Attachment 38955 Details for Bug 30374 – readd drm_lock_free

[patch] readd drm_lock_free

partial-revert.patch (text/plain), 1.06 KB, created by Daniel Vetter on 2010-09-25 14:28:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2010-09-25 14:28:56 UTC

Size: 1.06 KB

patch

obsolete

>commit 6fea3a43bebe69af61632ca936ef0bdf96459c15
>Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date:   Sat Sep 25 23:28:51 2010 +0200
>
>    Revert "drm: kill kernel_context_switch callbacks"
>    
>    This reverts commit 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f.
>
>diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
>index 4b9007e..e5d228e 100644
>--- a/drivers/gpu/drm/drm_lock.c
>+++ b/drivers/gpu/drm/drm_lock.c
>@@ -150,6 +150,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
> int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
> {
> 	struct drm_lock *lock = data;
>+	struct drm_master *master = file_priv->master;
> 
> 	if (lock->context == DRM_KERNEL_CONTEXT) {
> 		DRM_ERROR("Process %d using kernel context %d\n",
>@@ -159,6 +160,10 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
> 
> 	atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
> 
>+	if (drm_lock_free(&master->lock, lock->context)) {
>+		/* FIXME: Should really bail out here. */
>+	}
>+
> 	unblock_all_signals();
> 	return 0;
> }

Actions: View | Splinter Review

Attachments on bug 30374: 38952 | 38955

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.