Date: Tue, 6 May 2014 12:39:23 +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: r265439 - stable/9/sys/dev/drm2/i915 Message-ID: <201405061239.s46CdOBu089761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue May 6 12:39:23 2014 New Revision: 265439 URL: http://svnweb.freebsd.org/changeset/base/265439 Log: MFC r265102: Fix one cases of recursive acquisitions of the vm object lock, only possible in rare failure situations. The second part of r265102 is not applicable to stable/9 since vm_page_insert() cannot fail there. Modified: stable/9/sys/dev/drm2/i915/i915_gem.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/drm2/i915/i915_gem.c ============================================================================== --- stable/9/sys/dev/drm2/i915/i915_gem.c Tue May 6 12:35:19 2014 (r265438) +++ stable/9/sys/dev/drm2/i915/i915_gem.c Tue May 6 12:39:23 2014 (r265439) @@ -1427,6 +1427,7 @@ unlocked_vmobj: m = vm_phys_fictitious_to_vm_page(dev->agp->base + obj->gtt_offset + offset); if (m == NULL) { + VM_OBJECT_UNLOCK(vm_obj); cause = 60; ret = -EFAULT; goto unlock;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405061239.s46CdOBu089761>