diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
| commit | d4dbf457813e97531ded3bf24f3b6ad421189c69 (patch) | |
| tree | 8e47c1dd5d7cf9c8c4bce4a7e34531fc9a8eae75 /linux-core/drm_context.c | |
| parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) | |
Merged drmfntbl-0-0-2
Diffstat (limited to 'linux-core/drm_context.c')
| -rw-r--r-- | linux-core/drm_context.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c index dd280e53..cf3a536a 100644 --- a/linux-core/drm_context.c +++ b/linux-core/drm_context.c @@ -1,5 +1,5 @@ /** - * \file drm_context.h +* \file drm_context.h * IOCTLs for generic contexts * * \author Rickard E. (Rik) Faith <faith@valinux.com> @@ -43,11 +43,7 @@ #define __NO_VERSION__ #include "drmP.h" -#if !__HAVE_CTX_BITMAP -#error "__HAVE_CTX_BITMAP must be defined" -#endif - - +#ifndef DRIVER_ALTERNATE_CONTEXT /******************************************************************/ /** \name Context bitmap support */ /*@{*/ @@ -579,5 +575,18 @@ int DRM(rmctx)( struct inode *inode, struct file *filp, return 0; } +#endif +extern drm_ioctl_desc_t DRM(ioctls)[]; +void DRM(context_add_ioctls)(void) +{ + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)].func = DRM(setsareactx); + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)].auth_needed = 1; + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)].root_only = 1; + + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)].func = DRM(getsareactx); + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)].auth_needed = 1; + DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)].root_only = 0; +} /*@}*/ + |