drm/i915: Refresh the errno to vmf_fault translations (8f9fb61c) · Commits · 戴 / test

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+15 −24

Original line number	Diff line number	Diff line
		@@ -287,6 +287,9 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf)
		view.type = I915_GGTT_VIEW_PARTIAL;
		vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, flags);
		}

		/* The entire mappable GGTT is pinned? Unexpected! */
		GEM_BUG_ON(vma == ERR_PTR(-ENOSPC));
		}
		if (IS_ERR(vma)) {
		ret = PTR_ERR(vma);
		@@ -333,23 +336,19 @@ err_rpm:
		i915_gem_object_unpin_pages(obj);
		err:
		switch (ret) {
		case -EIO:
		/*
		* We eat errors when the gpu is terminally wedged to avoid
		* userspace unduly crashing (gl has no provisions for mmaps to
		* fail). But any other -EIO isn't ours (e.g. swap in failure)
		* and so needs to be reported.
		*/
		if (!intel_gt_is_wedged(ggtt->vm.gt))
		default:
		WARN_ONCE(ret, "unhandled error in %s: %i\n", __func__, ret);
		/* fallthrough */
		case -EIO: /* shmemfs failure from swap device */
		case -EFAULT: /* purged object */
		return VM_FAULT_SIGBUS;
		/* else, fall through */
		case -EAGAIN:
		/*
		* EAGAIN means the gpu is hung and we'll wait for the error
		* handler to reset everything when re-faulting in
		* i915_mutex_lock_interruptible.
		*/

		case -ENOSPC: /* shmemfs allocation failure */
		case -ENOMEM: /* our allocation failure */
		return VM_FAULT_OOM;

		case 0:
		case -EAGAIN:
		case -ERESTARTSYS:
		case -EINTR:
		case -EBUSY:
		@@ -358,14 +357,6 @@ err:
		* already did the job.
		*/
		return VM_FAULT_NOPAGE;
		case -ENOMEM:
		return VM_FAULT_OOM;
		case -ENOSPC:
		case -EFAULT:
		return VM_FAULT_SIGBUS;
		default:
		WARN_ONCE(ret, "unhandled error in %s: %i\n", __func__, ret);
		return VM_FAULT_SIGBUS;
		}
		}