svn commit: r190015 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm

[Robert Noland]

Author: rnoland
Date: Thu Mar 19 07:37:00 2009
New Revision: 190015
URL: http://svn.freebsd.org/changeset/base/190015

Log:
  Merge 189868
  
  Fix R600 writeback across suspend/resume.
  
  This is likely a NOOP for us, since I haven't ported the suspend/resume
  code yet.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/r600_cp.c

Modified: stable/7/sys/dev/drm/r600_cp.c
==============================================================================
--- stable/7/sys/dev/drm/r600_cp.c	Thu Mar 19 06:44:00 2009	(r190014)
+++ stable/7/sys/dev/drm/r600_cp.c	Thu Mar 19 07:37:00 2009	(r190015)
@@ -1740,9 +1740,6 @@ static void r600_cp_init_ring_buffer(str
 
 	RADEON_WRITE(R600_CP_DEBUG, (1 << 27) | (1 << 28));
 
-	/* Start with assuming that writeback doesn't work */
-	dev_priv->writeback_works = 0;
-
 	/* Initialize the scratch register pointer.  This will cause
 	 * the scratch register values to be written out to memory
 	 * whenever they are updated.