From owner-cvs-src-old@FreeBSD.ORG  Tue Jun 23 16:14:18 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D5B21065670
	for <cvs-src-old@freebsd.org>; Tue, 23 Jun 2009 16:14:18 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A0788FC12
	for <cvs-src-old@freebsd.org>; Tue, 23 Jun 2009 16:14:18 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NGEIPj022502
	for <cvs-src-old@freebsd.org>; Tue, 23 Jun 2009 16:14:18 GMT
	(envelope-from rnoland@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5NGEIxJ022501
	for cvs-src-old@freebsd.org; Tue, 23 Jun 2009 16:14:18 GMT
	(envelope-from rnoland@repoman.freebsd.org)
Message-Id: <200906231614.n5NGEIxJ022501@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rnoland@repoman.freebsd.org using -f
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 23 Jun 2009 16:14:08 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/dev/drm i915_dma.c i915_drv.h i915_irq.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2009 16:14:18 -0000

rnoland     2009-06-23 16:14:08 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/drm          i915_dma.c i915_drv.h i915_irq.c 
  Log:
  SVN rev 194737 on 2009-06-23 16:14:08Z by rnoland
  
  Merge 194540 from HEAD
  
  The G45 docs indicate that all G4X chips use the new framecount register.
  
  Intel agrees with my reading of the docs, make it so for all G4X chips.
  
  The new register also has a 32 bit width as opposed to 24 bits.  Fix
  things up so that the counters roll over properly.
  
  Revision  Changes    Path
  1.6.2.9   +6 -3      src/sys/dev/drm/i915_dma.c
  1.4.2.7   +1 -1      src/sys/dev/drm/i915_drv.h
  1.4.2.8   +1 -3      src/sys/dev/drm/i915_irq.c