Wed Jul 24 03:28:42 2013 UTC ()
Ifdef out drm prime stuff from i915_drv.c.


(riastradh)
diff -r1.1.1.1.2.11 -r1.1.1.1.2.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs diff -r1.1.1.1.2.11 -r1.1.1.1.2.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c 2013/07/24 03:26:53 1.1.1.1.2.11
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c 2013/07/24 03:28:42 1.1.1.1.2.12
@@ -1073,30 +1073,32 @@ static struct drm_driver driver = { @@ -1073,30 +1073,32 @@ static struct drm_driver driver = {
1073 .master_destroy = i915_master_destroy, 1073 .master_destroy = i915_master_destroy,
1074#if defined(CONFIG_DEBUG_FS) 1074#if defined(CONFIG_DEBUG_FS)
1075 .debugfs_init = i915_debugfs_init, 1075 .debugfs_init = i915_debugfs_init,
1076 .debugfs_cleanup = i915_debugfs_cleanup, 1076 .debugfs_cleanup = i915_debugfs_cleanup,
1077#endif 1077#endif
1078 .gem_init_object = i915_gem_init_object, 1078 .gem_init_object = i915_gem_init_object,
1079 .gem_free_object = i915_gem_free_object, 1079 .gem_free_object = i915_gem_free_object,
1080#ifdef __NetBSD__ 1080#ifdef __NetBSD__
1081 .gem_uvm_ops = NULL, 1081 .gem_uvm_ops = NULL,
1082#else 1082#else
1083 .gem_vm_ops = &i915_gem_vm_ops, 1083 .gem_vm_ops = &i915_gem_vm_ops,
1084#endif 1084#endif
1085 1085
 1086#ifndef __NetBSD__ /* XXX drm prime */
1086 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, 1087 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
1087 .prime_fd_to_handle = drm_gem_prime_fd_to_handle, 1088 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
1088 .gem_prime_export = i915_gem_prime_export, 1089 .gem_prime_export = i915_gem_prime_export,
1089 .gem_prime_import = i915_gem_prime_import, 1090 .gem_prime_import = i915_gem_prime_import,
 1091#endif
1090 1092
1091 .dumb_create = i915_gem_dumb_create, 1093 .dumb_create = i915_gem_dumb_create,
1092 .dumb_map_offset = i915_gem_mmap_gtt, 1094 .dumb_map_offset = i915_gem_mmap_gtt,
1093 .dumb_destroy = i915_gem_dumb_destroy, 1095 .dumb_destroy = i915_gem_dumb_destroy,
1094 .ioctls = i915_ioctls, 1096 .ioctls = i915_ioctls,
1095#ifdef __NetBSD__ 1097#ifdef __NetBSD__
1096 .fops = NULL, 1098 .fops = NULL,
1097#else 1099#else
1098 .fops = &i915_driver_fops, 1100 .fops = &i915_driver_fops,
1099#endif 1101#endif
1100 .name = DRIVER_NAME, 1102 .name = DRIVER_NAME,
1101 .desc = DRIVER_DESC, 1103 .desc = DRIVER_DESC,
1102 .date = DRIVER_DATE, 1104 .date = DRIVER_DATE,