diff options
| author | kib <kib@FreeBSD.org> | 2013-10-29 07:35:19 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-10-29 07:35:19 +0000 |
| commit | 492a1ca90c74783f3e8e17f6bec7a153b1dc7efe (patch) | |
| tree | e27fc9cd6d3e315f0a2c06576e660b88365232d3 /sys/dev/drm2 | |
| parent | aaa21934ba597834865408b1a7cb5974c59a7454 (diff) | |
| download | FreeBSD-src-492a1ca90c74783f3e8e17f6bec7a153b1dc7efe.zip FreeBSD-src-492a1ca90c74783f3e8e17f6bec7a153b1dc7efe.tar.gz | |
MFC r256848:
Use plain register read for waiting of the reset completion
notification, to avoid gt_lock recursion.
Approved by: re (glebius)
Diffstat (limited to 'sys/dev/drm2')
| -rw-r--r-- | sys/dev/drm2/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/drm2/i915/i915_drv.c b/sys/dev/drm2/i915/i915_drv.c index c90d1d1..a6bbb7d 100644 --- a/sys/dev/drm2/i915/i915_drv.c +++ b/sys/dev/drm2/i915/i915_drv.c @@ -685,7 +685,7 @@ gen6_do_reset(struct drm_device *dev, u8 flags) /* 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 */ |
