Commit e55978a4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2022-10-13' of... 

Merge tag 'drm-intel-next-fixes-2022-10-13' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

- Fix revocation of non-persistent contexts (Tvrtko Ursulin)
- Handle migration for dpt (Matthew Auld)
- Fix display problems after resume (Thomas Hellström)
- Allow control over the flags when migrating (Matthew Auld)
- Consider DG2_RC_CCS_CC when migrating buffers (Matthew Auld)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y0gK9QmCmktLLzqp@tursulin-desk
parents d6fe5887 ea19684a

drivers/gpu/drm/i915/display/intel_fb_pin.c

+44 −18
Original line number Diff line number Diff line
@@ -26,10 +26,17 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb, 
	struct drm_device *dev = fb->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	struct i915_gem_ww_ctx ww;

	struct i915_vma *vma;

	u32 alignment;

	int ret;



	/*

	 * We are not syncing against the binding (and potential migrations)

	 * below, so this vm must never be async.

	 */

	GEM_WARN_ON(vm->bind_async_flags);



	if (WARN_ON(!i915_gem_object_is_framebuffer(obj)))

		return ERR_PTR(-EINVAL);
@@ -37,29 +44,48 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb, 


	atomic_inc(&dev_priv->gpu_error.pending_fb_pin);



	ret = i915_gem_object_lock_interruptible(obj, NULL);

	if (!ret) {

		ret = i915_gem_object_set_cache_level(obj, I915_CACHE_NONE);

		i915_gem_object_unlock(obj);

	}

	if (ret) {

		vma = ERR_PTR(ret);

		goto err;

	for_i915_gem_ww(&ww, ret, true) {

		ret = i915_gem_object_lock(obj, &ww);

		if (ret)

			continue;



		if (HAS_LMEM(dev_priv)) {

			unsigned int flags = obj->flags;



			/*

			 * For this type of buffer we need to able to read from the CPU

			 * the clear color value found in the buffer, hence we need to

			 * ensure it is always in the mappable part of lmem, if this is

			 * a small-bar device.

			 */

			if (intel_fb_rc_ccs_cc_plane(fb) >= 0)

				flags &= ~I915_BO_ALLOC_GPU_ONLY;

			ret = __i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM_0,

							flags);

			if (ret)

				continue;

		}



		ret = i915_gem_object_set_cache_level(obj, I915_CACHE_NONE);

		if (ret)

			continue;



		vma = i915_vma_instance(obj, vm, view);

	if (IS_ERR(vma))

		goto err;

		if (IS_ERR(vma)) {

			ret = PTR_ERR(vma);

			continue;

		}



		if (i915_vma_misplaced(vma, 0, alignment, 0)) {

		ret = i915_vma_unbind_unlocked(vma);

		if (ret) {

			vma = ERR_PTR(ret);

			goto err;

		}

			ret = i915_vma_unbind(vma);

			if (ret)

				continue;

		}



	ret = i915_vma_pin(vma, 0, alignment, PIN_GLOBAL);

		ret = i915_vma_pin_ww(vma, &ww, 0, alignment, PIN_GLOBAL);

		if (ret)

			continue;

	}

	if (ret) {

		vma = ERR_PTR(ret);

		goto err;

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

+1 −7
Original line number Diff line number Diff line
@@ -1383,14 +1383,8 @@ kill_engines(struct i915_gem_engines *engines, bool exit, bool persistent) 
	 */

	for_each_gem_engine(ce, engines, it) {

		struct intel_engine_cs *engine;

		bool skip = false;



		if (exit)

			skip = intel_context_set_exiting(ce);

		else if (!persistent)

			skip = intel_context_exit_nonpersistent(ce, NULL);



		if (skip)

		if ((exit || !persistent) && intel_context_revoke(ce))

			continue; /* Already marked. */



		/*

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

+36 −1
Original line number Diff line number Diff line
@@ -652,6 +652,41 @@ bool i915_gem_object_can_migrate(struct drm_i915_gem_object *obj, 
int i915_gem_object_migrate(struct drm_i915_gem_object *obj,

			    struct i915_gem_ww_ctx *ww,

			    enum intel_region_id id)

{

	return __i915_gem_object_migrate(obj, ww, id, obj->flags);

}



/**

 * __i915_gem_object_migrate - Migrate an object to the desired region id, with

 * control of the extra flags

 * @obj: The object to migrate.

 * @ww: An optional struct i915_gem_ww_ctx. If NULL, the backend may

 * not be successful in evicting other objects to make room for this object.

 * @id: The region id to migrate to.

 * @flags: The object flags. Normally just obj->flags.

 *

 * Attempt to migrate the object to the desired memory region. The

 * object backend must support migration and the object may not be

 * pinned, (explicitly pinned pages or pinned vmas). The object must

 * be locked.

 * On successful completion, the object will have pages pointing to

 * memory in the new region, but an async migration task may not have

 * completed yet, and to accomplish that, i915_gem_object_wait_migration()

 * must be called.

 *

 * Note: the @ww parameter is not used yet, but included to make sure

 * callers put some effort into obtaining a valid ww ctx if one is

 * available.

 *

 * Return: 0 on success. Negative error code on failure. In particular may

 * return -ENXIO on lack of region space, -EDEADLK for deadlock avoidance

 * if @ww is set, -EINTR or -ERESTARTSYS if signal pending, and

 * -EBUSY if the object is pinned.

 */

int __i915_gem_object_migrate(struct drm_i915_gem_object *obj,

			      struct i915_gem_ww_ctx *ww,

			      enum intel_region_id id,

			      unsigned int flags)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct intel_memory_region *mr;
@@ -672,7 +707,7 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, 
		return 0;

	}



	return obj->ops->migrate(obj, mr);

	return obj->ops->migrate(obj, mr, flags);

}



/**

drivers/gpu/drm/i915/gem/i915_gem_object.h

+4 −0
Original line number Diff line number Diff line
@@ -608,6 +608,10 @@ bool i915_gem_object_migratable(struct drm_i915_gem_object *obj); 
int i915_gem_object_migrate(struct drm_i915_gem_object *obj,

			    struct i915_gem_ww_ctx *ww,

			    enum intel_region_id id);

int __i915_gem_object_migrate(struct drm_i915_gem_object *obj,

			      struct i915_gem_ww_ctx *ww,

			      enum intel_region_id id,

			      unsigned int flags);



bool i915_gem_object_can_migrate(struct drm_i915_gem_object *obj,

				 enum intel_region_id id);

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ struct drm_i915_gem_object_ops { 
	 * pinning or for as long as the object lock is held.

	 */

	int (*migrate)(struct drm_i915_gem_object *obj,

		       struct intel_memory_region *mr);

		       struct intel_memory_region *mr,

		       unsigned int flags);



	void (*release)(struct drm_i915_gem_object *obj);