From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 29 07:35:19 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BA7C0A9A;
 Tue, 29 Oct 2013 07:35:19 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7AAD2023;
 Tue, 29 Oct 2013 07:35:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9T7ZJiZ051202;
 Tue, 29 Oct 2013 07:35:19 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9T7ZJFH051201;
 Tue, 29 Oct 2013 07:35:19 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201310290735.r9T7ZJFH051201@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 29 Oct 2013 07:35:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257311 - stable/10/sys/dev/drm2/i915
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 07:35:19 -0000

Author: kib
Date: Tue Oct 29 07:35:19 2013
New Revision: 257311
URL: http://svnweb.freebsd.org/changeset/base/257311

Log:
  MFC r256848:
  Use plain register read for waiting of the reset completion
  notification, to avoid gt_lock recursion.
  
  Approved by:	re (glebius)

Modified:
  stable/10/sys/dev/drm2/i915/i915_drv.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/dev/drm2/i915/i915_drv.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/i915_drv.c	Tue Oct 29 07:33:55 2013	(r257310)
+++ stable/10/sys/dev/drm2/i915/i915_drv.c	Tue Oct 29 07:35:19 2013	(r257311)
@@ -685,7 +685,7 @@ gen6_do_reset(struct drm_device *dev, u8
 
 	/* Spin waiting for the device to ack the reset request */
 	ret = _intel_wait_for(dev,
-	    (I915_READ(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0,
+	    (I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0,
 	    500, 1, "915rst");
 
 	/* If reset with a user forcewake, try to restore, otherwise turn it off */