Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:52:06 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_gem.c
Log Message:
Remove drm prime stuff from drm_gem.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/drm/drm_gem.c
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/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.1.1.1.2.3 Wed Jul 24 02:22:43 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Wed Jul 24 02:52:06 2013
@@ -204,6 +204,7 @@ free:
}
EXPORT_SYMBOL(drm_gem_object_alloc);
+#ifndef __NetBSD__ /* XXX drm prime */
static void
drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
{
@@ -216,6 +217,7 @@ drm_gem_remove_prime_handles(struct drm_
obj->export_dma_buf);
}
}
+#endif
/**
* Removes the mapping from handle to filp for this object.
@@ -249,7 +251,9 @@ drm_gem_handle_delete(struct drm_file *f
idr_remove(&filp->object_idr, handle);
spin_unlock(&filp->table_lock);
+#ifndef __NetBSD__
drm_gem_remove_prime_handles(obj, filp);
+#endif
if (dev->driver->gem_close_object)
dev->driver->gem_close_object(obj, filp);
@@ -544,7 +548,9 @@ drm_gem_object_release_handle(int id, vo
struct drm_gem_object *obj = ptr;
struct drm_device *dev = obj->dev;
+#ifndef __NetBSD__ /* XXX drm prime */
drm_gem_remove_prime_handles(obj, file_priv);
+#endif
if (dev->driver->gem_close_object)
dev->driver->gem_close_object(obj, file_priv);
