diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-26 00:24:48 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-26 05:35:49 +0200 |
| commit | 45ff46c54a31bf8924b61e3e3411654410a3b5c3 (patch) | |
| tree | d428a95421862f8f1917f7a15e9cd78af4e1a60e /drivers/gpu/drm/drm_lock.c | |
| parent | Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into d... (diff) | |
| download | linux-45ff46c54a31bf8924b61e3e3411654410a3b5c3.tar.xz linux-45ff46c54a31bf8924b61e3e3411654410a3b5c3.zip | |
drm: readd drm_lock_free in drm_unlock
I've accidently killed a little bit too much in
commit 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon Aug 23 22:53:24 2010 +0200
drm: kill kernel_context_switch callbacks
Note to self: Next time also test with AIGLX disabled.
Reported-and-Tested-by: Andy Furniss <lists@andyfurniss.entadsl.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30374
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_lock.c')
| -rw-r--r-- | drivers/gpu/drm/drm_lock.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 1e28b9072068..632ae243ede0 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -152,6 +152,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", @@ -161,6 +162,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; } |