[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/include/drm Ifdef out a ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9018d4ec46d1
branches:  riastradh-drm2
changeset: 788031:9018d4ec46d1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 01:55:29 2013 +0000

description:
Ifdef out a bunch of stuff in <drm/drmP.h>.

Some of it is for debugs/sysfs/procfs and not fit for NetBSD.
Some of it is to be revisited later and adapted to NetBSD.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h |  18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diffs (115 lines):

diff -r a198a65916ae -r 9018d4ec46d1 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 01:55:14 2013 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 01:55:29 2013 +0000
@@ -1006,6 +1006,7 @@
 #define DRM_MINOR_RENDER 3
 
 
+#ifndef __NetBSD__
 /**
  * debugfs node list. This structure represents a debugfs file to
  * be created by the drm core
@@ -1046,6 +1047,7 @@
        struct drm_info_list *info_ent;
        struct dentry *dent;
 };
+#endif
 
 /**
  * DRM minor structure. This structure represents a drm minor number.
@@ -1057,12 +1059,14 @@
        struct device kdev;             /**< Linux device */
        struct drm_device *dev;
 
+#ifndef __NetBSD__
        struct proc_dir_entry *proc_root;  /**< proc directory entry */
        struct drm_info_node proc_nodes;
        struct dentry *debugfs_root;
 
        struct list_head debugfs_list;
        struct mutex debugfs_lock; /* Protects debugfs_list. */
+#endif
 
        struct drm_master *master; /* currently active master for this node */
        struct list_head master_list;
@@ -1233,7 +1237,9 @@
        void *mm_private;
        struct address_space *dev_mapping;
        struct drm_sigdata sigdata;        /**< For block_all_signals */
+#ifndef __NetBSD__
        sigset_t sigmask;
+#endif
 
        struct drm_driver *driver;
        struct drm_local_map *agp_buffer_map;
@@ -1333,6 +1339,8 @@
 /** \name Internal function definitions */
 /*@{*/
 
+#ifndef __NetBSD__             /* XXX temporary measure 20130212 */
+
                                /* Driver support (drm_drv.h) */
 extern long drm_ioctl(struct file *filp,
                      unsigned int cmd, unsigned long arg);
@@ -1356,6 +1364,8 @@
 extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 
+#endif
+
                                /* Memory management support (drm_memory.h) */
 #include <drm/drm_memory.h>
 extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
@@ -1419,10 +1429,12 @@
                         struct drm_file *file_priv);
 extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic);
 
+#ifndef __NetBSD__             /* XXX temporary measure 20130212 */
 /* Cache management (drm_cache.c) */
 void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
 void drm_clflush_sg(struct sg_table *st);
 void drm_clflush_virt_range(char *addr, unsigned long length);
+#endif
 
                                /* Locking IOCTL support (drm_lock.h) */
 extern int drm_lock(struct drm_device *dev, void *data,
@@ -1584,6 +1596,7 @@
 extern int drm_debugfs_cleanup(struct drm_minor *minor);
 #endif
 
+#ifndef __NetBSD__
                                /* Info file support */
 extern int drm_name_info(struct seq_file *m, void *data);
 extern int drm_vm_info(struct seq_file *m, void *data);
@@ -1591,6 +1604,7 @@
 extern int drm_vblank_info(struct seq_file *m, void *data);
 extern int drm_clients_info(struct seq_file *m, void* data);
 extern int drm_gem_name_info(struct seq_file *m, void *data);
+#endif
 
 
 extern int drm_gem_prime_handle_to_fd(struct drm_device *dev,
@@ -1604,10 +1618,12 @@
 extern int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
                                        struct drm_file *file_priv);
 
+#ifndef __NetBSD__             /* XXX temporary measure 20130212 */
 extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
                                            dma_addr_t *addrs, int max_pages);
 extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages);
 extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
+#endif
 
 
 void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv);
@@ -1621,8 +1637,10 @@
                         struct drm_gem_object **obj);
 
 #if DRM_DEBUG_CODE
+#ifndef __NetBSD__
 extern int drm_vma_info(struct seq_file *m, void *data);
 #endif
+#endif
 
                                /* Scatter Gather Support (drm_scatter.h) */
 extern void drm_sg_cleanup(struct drm_sg_mem * entry);