Date: Tue, 6 May 2014 12:31:25 +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-10@freebsd.org Subject: svn commit: r265437 - stable/10/sys/dev/drm2/i915 Message-ID: <201405061231.s46CVPHZ088184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue May 6 12:31:25 2014 New Revision: 265437 URL: http://svnweb.freebsd.org/changeset/base/265437 Log: MFC r265102: Fix two cases of recursive acquisitions of the vm object lock, only possible in rare failure situations. Modified: stable/10/sys/dev/drm2/i915/i915_gem.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/i915/i915_gem.c ============================================================================== --- stable/10/sys/dev/drm2/i915/i915_gem.c Tue May 6 12:31:17 2014 (r265436) +++ stable/10/sys/dev/drm2/i915/i915_gem.c Tue May 6 12:31:25 2014 (r265437) @@ -1431,6 +1431,7 @@ retry: m = vm_phys_fictitious_to_vm_page(dev->agp->base + obj->gtt_offset + offset); if (m == NULL) { + VM_OBJECT_WUNLOCK(vm_obj); cause = 60; ret = -EFAULT; goto unlock; @@ -1450,7 +1451,6 @@ retry: DRM_UNLOCK(dev); VM_OBJECT_WUNLOCK(vm_obj); VM_WAIT; - VM_OBJECT_WLOCK(vm_obj); goto retry; } m->valid = VM_PAGE_BITS_ALL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405061231.s46CVPHZ088184>