svn commit: r194741 - head/sys/dev/drm

[Robert Noland]

Author: rnoland
Date: Tue Jun 23 17:38:28 2009
New Revision: 194741
URL: http://svn.freebsd.org/changeset/base/194741

Log:
  Hold the lock while we save/restore register for suspend/resume.
  
  MFC after:	3 days

Modified:
  head/sys/dev/drm/i915_drv.c

Modified: head/sys/dev/drm/i915_drv.c
==============================================================================
--- head/sys/dev/drm/i915_drv.c	Tue Jun 23 17:19:50 2009	(r194740)
+++ head/sys/dev/drm/i915_drv.c	Tue Jun 23 17:38:28 2009	(r194741)
@@ -52,7 +52,10 @@ static int i915_suspend(device_t kdev)
 		return -ENODEV;
 	}
 
+	DRM_LOCK();
+	DRM_DEBUG("starting suspend\n");
 	i915_save_state(dev);
+	DRM_UNLOCK();
 
 	return (bus_generic_suspend(kdev));
 }
@@ -61,7 +64,10 @@ static int i915_resume(device_t kdev)
 {
 	struct drm_device *dev = device_get_softc(kdev);
 
+	DRM_LOCK();
 	i915_restore_state(dev);
+	DRM_DEBUG("finished resume\n");
+	DRM_UNLOCK();
 
 	return (bus_generic_resume(kdev));
 }