summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/via/via_video.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2019-07-23 23:09:42 +0300
committerSam Ravnborg <sam@ravnborg.org>2019-07-25 18:35:11 +0300
commit9154e60c4e057296983ef08d96ab5db76c1574c2 (patch)
tree3d88b525991f6e8b52e94fcec1ab8337fa45861b /drivers/gpu/drm/via/via_video.c
parent3bf2a06e3612575284202c63de4f584006a85146 (diff)
downloadlinux-9154e60c4e057296983ef08d96ab5db76c1574c2.tar.xz
drm/via: copy DRM_WAIT_ON as VIA_WAIT_ON and use it
VIA_WAIT_ON() is a direct copy of DRM_WAIT_ON() from drm_os_linux.h. The copy is made so we can avoid the dependency on the legacy header. A more involved approach had been to introduce wait_event_* but for this legacy driver the simpler and more safe approach with a copy of the macro was selected. Added the relevant header files for the functions used in VIA_WAIT_ON. v3: - Updated users of DRM_WAIT_ON => VIA_WAIT_ON (Emil) - Updated $subject (Emil) Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Cc: Kevin Brace <kevinbrace@gmx.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> Cc: Mike Marshall <hubcap@omnibond.com> Cc: Ira Weiny <ira.weiny@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Michel Dänzer <michel@daenzer.net> Link: https://patchwork.freedesktop.org/patch/msgid/20190723200944.17285-3-sam@ravnborg.org
Diffstat (limited to 'drivers/gpu/drm/via/via_video.c')
-rw-r--r--drivers/gpu/drm/via/via_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index a9ffbad1cfdd..cf53612c945e 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -82,7 +82,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
switch (fx->func) {
case VIA_FUTEX_WAIT:
- DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
+ VIA_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
(fx->ms / 10) * (HZ / 100), *lock != fx->val);
return ret;
case VIA_FUTEX_WAKE: