From owner-svn-src-head@FreeBSD.ORG  Mon Mar  9 07:24:33 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CC6B106566B;
	Mon,  9 Mar 2009 07:24:33 +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 3B0528FC08;
	Mon,  9 Mar 2009 07:24:33 +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 n297OX8J012994;
	Mon, 9 Mar 2009 07:24:33 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n297OXPO012993;
	Mon, 9 Mar 2009 07:24:33 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200903090724.n297OXPO012993@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Mon, 9 Mar 2009 07:24:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189557 - head/sys/dev/drm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Mar 2009 07:24:34 -0000

Author: rnoland
Date: Mon Mar  9 07:24:32 2009
New Revision: 189557
URL: http://svn.freebsd.org/changeset/base/189557

Log:
  Call the right function for the right chipset.
  
  MFC after:	10 days

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

Modified: head/sys/dev/drm/radeon_cp.c
==============================================================================
--- head/sys/dev/drm/radeon_cp.c	Mon Mar  9 06:14:27 2009	(r189556)
+++ head/sys/dev/drm/radeon_cp.c	Mon Mar  9 07:24:32 2009	(r189557)
@@ -1705,7 +1705,7 @@ void radeon_do_release(struct drm_device
 	if (dev_priv) {
 		if (dev_priv->cp_running) {
 			/* Stop the cp */
-			if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_R600) {
+			if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) {
 				while ((ret = r600_do_cp_idle(dev_priv)) != 0) {
 					DRM_DEBUG("radeon_do_cp_idle %d\n", ret);
 #ifdef __linux__