Date: Tue, 29 Oct 2013 07:48:37 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r257312 - stable/9/sys/dev/drm2/i915 Message-ID: <201310290748.r9T7mb4v055224@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Oct 29 07:48:36 2013 New Revision: 257312 URL: http://svnweb.freebsd.org/changeset/base/257312 Log: MFC r256848: Use plain register read for waiting of the reset completion notification, to avoid gt_lock recursion. Modified: stable/9/sys/dev/drm2/i915/i915_drv.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/drm2/i915/i915_drv.c ============================================================================== --- stable/9/sys/dev/drm2/i915/i915_drv.c Tue Oct 29 07:35:19 2013 (r257311) +++ stable/9/sys/dev/drm2/i915/i915_drv.c Tue Oct 29 07:48:36 2013 (r257312) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310290748.r9T7mb4v055224>