Commit 2254f637 authored by Dave Airlie's avatar Dave Airlie

drm/nouveau: fix up 32-bit ioctls and device wake up.

Noticed by kbuild test robot.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a5b6f74e
...@@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd, ...@@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
if (fn != NULL) if (fn != NULL)
ret = (*fn)(filp, cmd, arg); ret = (*fn)(filp, cmd, arg);
else else
ret = drm_ioctl(filp, cmd, arg); ret = nouveau_drm_ioctl(filp, cmd, arg);
return ret; return ret;
} }
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
#define __NOUVEAU_IOCTL_H__ #define __NOUVEAU_IOCTL_H__
long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg); long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);
long nouveau_drm_ioctl(struct file *, unsigned int cmd, unsigned long arg);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment