Commit 576c4ef5 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Force ww lock for i915_gem_object_ggtt_pin_ww, v2. 



We will need the lock to unbind the vma, and wait for bind to complete.
Remove the special casing for the !ww path, and force ww locking for all.

Changes since v1:
- Pass err to for_i915_gem_ww handling for -EDEADLK handling.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216142749.1966107-6-maarten.lankhorst@linux.intel.com
parent 2abb6195

drivers/gpu/drm/i915/i915_drv.h

+2 −5
Original line number Diff line number Diff line
@@ -1869,13 +1869,10 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, 
			    const struct i915_ggtt_view *view,

			    u64 size, u64 alignment, u64 flags);



static inline struct i915_vma * __must_check

struct i915_vma * __must_check

i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,

			 const struct i915_ggtt_view *view,

			 u64 size, u64 alignment, u64 flags)

{

	return i915_gem_object_ggtt_pin_ww(obj, NULL, view, size, alignment, flags);

}

			 u64 size, u64 alignment, u64 flags);



int i915_gem_object_unbind(struct drm_i915_gem_object *obj,

			   unsigned long flags);

drivers/gpu/drm/i915/i915_gem.c

+26 −4
Original line number Diff line number Diff line
@@ -877,6 +877,8 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, 
	struct i915_vma *vma;

	int ret;



	GEM_WARN_ON(!ww);



	if (flags & PIN_MAPPABLE &&

	    (!view || view->type == I915_GGTT_VIEW_NORMAL)) {

		/*
@@ -936,10 +938,7 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, 
			return ERR_PTR(ret);

	}



	if (ww)

	ret = i915_vma_pin_ww(vma, ww, size, alignment, flags | PIN_GLOBAL);

	else

		ret = i915_vma_pin(vma, size, alignment, flags | PIN_GLOBAL);



	if (ret)

		return ERR_PTR(ret);
@@ -959,6 +958,29 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, 
	return vma;

}



struct i915_vma * __must_check

i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,

			 const struct i915_ggtt_view *view,

			 u64 size, u64 alignment, u64 flags)

{

	struct i915_gem_ww_ctx ww;

	struct i915_vma *ret;

	int err;



	for_i915_gem_ww(&ww, err, true) {

		err = i915_gem_object_lock(obj, &ww);

		if (err)

			continue;



		ret = i915_gem_object_ggtt_pin_ww(obj, &ww, view, size,

						  alignment, flags);

		if (IS_ERR(ret))

			err = PTR_ERR(ret);

	}



	return err ? ERR_PTR(err) : ret;

}



int

i915_gem_madvise_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)