Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/3aec6e58f67d
branches:  riastradh-drm2
changeset: 788238:3aec6e58f67d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:51:51 2013 +0000

description:
Ifdef out some drm prime stuff in drmP.h.

diffstat:

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

diffs (33 lines):

diff -r 272b7312d2da -r 3aec6e58f67d sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 02:51:35 2013 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Wed Jul 24 02:51:51 2013 +0000
@@ -793,11 +793,13 @@
 
        void *driver_private;
 
+#ifndef __NetBSD__         /* XXX drm prime */
        /* dma buf exported from this GEM object */
        struct dma_buf *export_dma_buf;
 
        /* dma buf attachment backing this object */
        struct dma_buf_attachment *import_attach;
+#endif
 };
 
 #include <drm/drm_crtc.h>
@@ -1761,6 +1763,7 @@
 #endif
 
 
+#ifndef __NetBSD__             /* XXX drm prime */
 void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv);
 void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv);
 int drm_prime_add_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t handle);
@@ -1770,6 +1773,7 @@
 int drm_prime_add_dma_buf(struct drm_device *dev, struct drm_gem_object *obj);
 int drm_prime_lookup_obj(struct drm_device *dev, struct dma_buf *buf,
                         struct drm_gem_object **obj);
+#endif
 
 #if DRM_DEBUG_CODE
 #ifndef __NetBSD__



Home | Main Index | Thread Index | Old Index