Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.1.2.25
retrieving revision 1.1.1.1.2.26
diff -u -p -r1.1.1.1.2.25 -r1.1.1.1.2.26
--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c	2013/09/08 15:54:20	1.1.1.1.2.25
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/i915_dma.c	2013/09/08 16:00:22	1.1.1.1.2.26
@@ -1396,6 +1396,7 @@ cleanup_gem:
 	mutex_unlock(&dev->struct_mutex);
 	i915_gem_cleanup_aliasing_ppgtt(dev);
 cleanup_gem_stolen:
+	intel_modeset_cleanup(dev);
 	i915_gem_cleanup_stolen(dev);
 cleanup_vga_switcheroo:
 #ifndef __NetBSD__		/* XXX vga */
@@ -1725,7 +1726,7 @@ int i915_driver_load(struct drm_device *
 		ret = i915_load_modeset_init(dev);
 		if (ret < 0) {
 			DRM_ERROR("failed to init modeset\n");
-			goto out_gem_unload;
+			goto out_vblank_cleanup;
 		}
 	}
 
@@ -1743,6 +1744,9 @@ int i915_driver_load(struct drm_device *
 
 	return 0;
 
+out_vblank_cleanup:
+	drm_vblank_cleanup(dev);
+
 out_gem_unload:
 	if (dev_priv->mm.inactive_shrinker.shrink)
 		unregister_shrinker(&dev_priv->mm.inactive_shrinker);
@@ -1760,6 +1764,9 @@ out_gem_unload:
 
 	intel_teardown_gmbus(dev);
 	intel_teardown_mchbar(dev);
+#ifdef __NetBSD__		/* XXX gt fini */
+	intel_gt_fini(dev);
+#endif
 	destroy_workqueue(dev_priv->wq);
 out_mtrrfree:
 #ifndef __NetBSD__		/* XXX gtt */