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

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

details:   https://anonhg.NetBSD.org/src/rev/f3f26b7eef60
branches:  riastradh-drm2
changeset: 788303:f3f26b7eef60
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:09:26 2013 +0000

description:
Ifdef out i915_gem_object_get_page and i915_gem_fault in i915_drv.h.

Will restore when we have GEM VM stuff worked out.

diffstat:

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

diffs (29 lines):

diff -r fc14cffccb29 -r f3f26b7eef60 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:09:10 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:09:26 2013 +0000
@@ -1419,6 +1419,7 @@
 void i915_gem_lastclose(struct drm_device *dev);
 
 int __must_check i915_gem_object_get_pages(struct drm_i915_gem_object *obj);
+#ifndef __NetBSD__             /* XXX */
 static inline struct page *i915_gem_object_get_page(struct drm_i915_gem_object *obj, int n)
 {
        struct scatterlist *sg = obj->pages->sgl;
@@ -1433,6 +1434,7 @@
        }
        return sg_page(sg+n);
 }
+#endif
 static inline void i915_gem_object_pin_pages(struct drm_i915_gem_object *obj)
 {
        BUG_ON(obj->pages == NULL);
@@ -1515,7 +1517,9 @@
                     u32 *seqno);
 int __must_check i915_wait_seqno(struct intel_ring_buffer *ring,
                                 uint32_t seqno);
+#ifndef __NetBSD__             /* XXX */
 int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+#endif
 int __must_check
 i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,
                                  bool write);