Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:57:21 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_file.h
Log Message:
move ifdef goo from drmP.h to drm_file.h
Remove declarations already appearing in other headers
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/include/drm/drm_file.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.56 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.57
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.56 Sun Dec 19 01:57:13 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:57:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.56 2021/12/19 01:57:13 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.57 2021/12/19 01:57:20 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -209,33 +209,8 @@ struct drm_minor {
/*@{*/
/* Device support (drm_fops.h) */
-#ifdef __NetBSD__
-extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
-extern void drm_close_file(struct drm_file *);
-#else
-extern int drm_open(struct inode *inode, struct file *filp);
-extern ssize_t drm_read(struct file *filp, char __user *buffer,
- size_t count, loff_t *offset);
-extern int drm_release(struct inode *inode, struct file *filp);
-#endif
extern int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv);
- /* Mapping support (drm_vm.h) */
-#ifndef __NetBSD__
-extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
-#endif
-
-/* Misc. IOCTL support (drm_ioctl.c) */
-int drm_noop(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-int drm_invalid_op(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-
-/*
- * These are exported to drivers so that they can implement fencing using
- * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
- */
-
/* IRQ support (drm_irq.h) */
#ifdef __NetBSD__
extern int drm_irq_install(struct drm_device *dev);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_file.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.6
--- src/sys/external/bsd/drm2/dist/include/drm/drm_file.h:1.5 Sun Dec 19 01:56:50 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_file.h Sun Dec 19 01:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_file.h,v 1.5 2021/12/19 01:56:50 riastradh Exp $ */
+/* $NetBSD: drm_file.h,v 1.6 2021/12/19 01:57:21 riastradh Exp $ */
/*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -388,11 +388,16 @@ static inline bool drm_is_render_client(
return file_priv->minor->type == DRM_MINOR_RENDER;
}
+#ifdef __NetBSD__
+extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
+extern void drm_close_file(struct drm_file *);
+#else
int drm_open(struct inode *inode, struct file *filp);
ssize_t drm_read(struct file *filp, char __user *buffer,
size_t count, loff_t *offset);
int drm_release(struct inode *inode, struct file *filp);
__poll_t drm_poll(struct file *filp, struct poll_table_struct *wait);
+#endif
int drm_event_reserve_init_locked(struct drm_device *dev,
struct drm_file *file_priv,
struct drm_pending_event *p,
