summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-08-23 16:05:47 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2006-09-29 12:55:08 +0200
commit67e88e5628d02cd94561e31fd68e02b6bde66e6f (patch)
tree2190ef73b73c371b089ef82ff5e1017f1d50c32e /linux-core
parentbaa26c5faa3d5903569d1c94ad93b843d6979ba5 (diff)
Hook up DRM_IOCTL_UPDATE_DRAW ioctl.
(cherry picked from 98a89504589427a76c3f5cfa2266962a1a212672 commit)
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h2
-rw-r--r--linux-core/drm_drv.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 8a099ba1..8b3364e4 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -1169,6 +1169,8 @@ extern int drm_adddraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern int drm_rmdraw(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
+extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
+ unsigned int cmd, unsigned long arg);
extern drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev,
drm_drawable_t id);
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 89b20a9d..d4ef1306 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -123,7 +123,9 @@ static drm_ioctl_desc_t drm_ioctls[] = {
[DRM_IOCTL_NR(DRM_IOCTL_TTM)] = {drm_ttm_ioctl, DRM_AUTH},
[DRM_IOCTL_NR(DRM_IOCTL_BUFOBJ)] = {drm_bo_ioctl, DRM_AUTH},
[DRM_IOCTL_NR(DRM_IOCTL_MM_INIT)] = {drm_mm_init_ioctl,
- DRM_AUTH }
+ DRM_AUTH },
+
+ [DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW)] = {drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
};
#define DRIVER_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )