From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jun 23 16:09:05 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 658581065670;
	Tue, 23 Jun 2009 16:09:05 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5313C8FC2E;
	Tue, 23 Jun 2009 16:09:05 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NG95Et082423;
	Tue, 23 Jun 2009 16:09:05 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NG95mB082421;
	Tue, 23 Jun 2009 16:09:05 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906231609.n5NG95mB082421@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 23 Jun 2009 16:09:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194734 - in stable/7/sys: . contrib/pf dev/drm
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2009 16:09:06 -0000

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);