Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:09:26 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.7 Wed Jul 24 03:08:42 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Jul 24 03:09:26 2013
@@ -1419,6 +1419,7 @@ void i915_gem_release_mmap(struct drm_i9
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 @@ static inline struct page *i915_gem_obje
}
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 @@ int i915_add_request(struct intel_ring_b
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);
