Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:56:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_ioctl.h
Log Message:
move drmP drm_ioctl stuff to drm_ioctl.h
including ifdef goo
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.49 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.50
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.49 Sun Dec 19 01:56:00 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:56:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.49 2021/12/19 01:56:00 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.50 2021/12/19 01:56:08 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -130,30 +130,6 @@ typedef int drm_ioctl_t(struct drm_devic
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
-#ifdef __NetBSD__
-/* XXX Kludge...is there a better way to do this? */
-#define DRM_IOCTL_NR(n) \
- (IOCBASECMD(n) &~ (IOC_DIRMASK | (IOCGROUP(n) << IOCGROUP_SHIFT)))
-#define DRM_MAJOR cdevsw_lookup_major(&drm_cdevsw)
-#else
-#define DRM_IOCTL_NR(n) _IOC_NR(n)
-#define DRM_MAJOR 226
-#endif
-
-#define DRM_AUTH 0x1
-#define DRM_MASTER 0x2
-#define DRM_ROOT_ONLY 0x4
-#define DRM_CONTROL_ALLOW 0x8
-#define DRM_UNLOCKED 0x10
-#define DRM_RENDER_ALLOW 0x20
-
-struct drm_ioctl_desc {
- unsigned int cmd;
- int flags;
- drm_ioctl_t *func;
- const char *name;
-};
-
/**
* Creates a driver or general drm_ioctl_desc array entry for the given
* ioctl, for use by drm_ioctl().
@@ -697,20 +673,6 @@ static inline bool drm_is_primary_client
/** \name Internal function definitions */
/*@{*/
- /* Driver support (drm_drv.h) */
-extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);
-#ifdef __NetBSD__
-extern int drm_ioctl(struct file *, unsigned long, void *);
-extern struct spinlock drm_minor_lock;
-extern struct idr drm_minors_idr;
-#else
-extern long drm_ioctl(struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern long drm_compat_ioctl(struct file *filp,
- unsigned int cmd, unsigned long arg);
-#endif
-extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);
-
/* Device support (drm_fops.h) */
#ifdef __NetBSD__
extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h:1.3 Sun Dec 19 00:57:21 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_ioctl.h Sun Dec 19 01:56:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.h,v 1.3 2021/12/19 00:57:21 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.h,v 1.4 2021/12/19 01:56:08 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -69,8 +69,15 @@ typedef int drm_ioctl_t(struct drm_devic
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
+#ifdef __NetBSD__
+/* XXX Kludge...is there a better way to do this? */
+#define DRM_IOCTL_NR(n) \
+ (IOCBASECMD(n) &~ (IOC_DIRMASK | (IOCGROUP(n) << IOCGROUP_SHIFT)))
+#define DRM_MAJOR cdevsw_lookup_major(&drm_cdevsw)
+#else
#define DRM_IOCTL_NR(n) _IOC_NR(n)
#define DRM_MAJOR 226
+#endif
/**
* enum drm_ioctl_flags - DRM ioctl flags
