summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/via/via_video.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 11:34:43 +0100
committerDave Airlie <airlied@redhat.com>2013-12-18 11:34:13 +1000
commit57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd (patch)
tree935ea0949b91080532de66d1d74f8a97a4c81223 /drivers/gpu/drm/via/via_video.c
parente9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (diff)
downloadop-kernel-dev-57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd.zip
op-kernel-dev-57ed0f7b4375f4cb0ec3eccbc81f262294eefbcd.tar.gz
drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE
Less yelling ftw! Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/via/via_video.c')
-rw-r--r--drivers/gpu/drm/via/via_video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index f60cfb6..a9ffbad 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -36,7 +36,7 @@ void via_init_futex(drm_via_private_t *dev_priv)
DRM_DEBUG("\n");
for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
- DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i]));
+ init_waitqueue_head(&(dev_priv->decoder_queue[i]));
XVMCLOCKPTR(dev_priv->sarea_priv, i)->lock = 0;
}
}
@@ -58,7 +58,7 @@ void via_release_futex(drm_via_private_t *dev_priv, int context)
if ((_DRM_LOCKING_CONTEXT(*lock) == context)) {
if (_DRM_LOCK_IS_HELD(*lock)
&& (*lock & _DRM_LOCK_CONT)) {
- DRM_WAKEUP(&(dev_priv->decoder_queue[i]));
+ wake_up(&(dev_priv->decoder_queue[i]));
}
*lock = 0;
}
@@ -86,7 +86,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
(fx->ms / 10) * (HZ / 100), *lock != fx->val);
return ret;
case VIA_FUTEX_WAKE:
- DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock]));
+ wake_up(&(dev_priv->decoder_queue[fx->lock]));
return 0;
}
return 0;
OpenPOWER on IntegriCloud