svn commit: r194734 - in stable/7/sys: . contrib/pf dev/drm

[Robert Noland]

Author: rnoland
Date: Tue Jun 23 16:09:05 2009
New Revision: 194734
URL: http://svn.freebsd.org/changeset/base/194734

Log:
  Merge 190833 from HEAD
  
  check offsets for R300_ZB_ZPASS_ADDR

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/r300_cmdbuf.c

Modified: stable/7/sys/dev/drm/r300_cmdbuf.c
==============================================================================
--- stable/7/sys/dev/drm/r300_cmdbuf.c	Tue Jun 23 16:07:56 2009	(r194733)
+++ stable/7/sys/dev/drm/r300_cmdbuf.c	Tue Jun 23 16:09:05 2009	(r194734)
@@ -236,8 +236,11 @@ void r300_init_reg_flags(struct drm_devi
 	ADD_RANGE_MARK(R300_ZB_DEPTHOFFSET, 1, MARK_CHECK_OFFSET);	/* check offset */
 	ADD_RANGE(R300_ZB_DEPTHPITCH, 1);
 	ADD_RANGE(R300_ZB_DEPTHCLEARVALUE, 1);
-	ADD_RANGE(R300_ZB_ZMASK_OFFSET, 13);
-	ADD_RANGE(R300_ZB_ZPASS_DATA, 2); /* ZB_ZPASS_DATA, ZB_ZPASS_ADDR */
+	ADD_RANGE(R300_ZB_ZMASK_OFFSET, 5);
+	ADD_RANGE(R300_ZB_HIZ_OFFSET, 5);
+	ADD_RANGE(R300_ZB_ZPASS_DATA, 1);
+	ADD_RANGE_MARK(R300_ZB_ZPASS_ADDR, 1, MARK_CHECK_OFFSET);       /* check offset */
+	ADD_RANGE(R300_ZB_DEPTHXY_OFFSET, 1)
 
 	ADD_RANGE(R300_TX_FILTER_0, 16);
 	ADD_RANGE(R300_TX_FILTER1_0, 16);