Commit 255e094a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2025-01-10' of... 

Merge tag 'drm-intel-gt-next-2025-01-10' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

Driver Changes:

- More robust engine resets on Haswell and older (Nitin)

- Dead code removal (David)
- Selftest, logging and tracing improvements (Sk, Nitin, Sebastian,
  Apoorva)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z4DidoEACFu7D6iG@jlahtine-mobl.ger.corp.intel.com
parents 39388d53 6f0572fa

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

+0 −23
Original line number Diff line number Diff line
@@ -52,29 +52,6 @@ bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj) 
		      mr->type == INTEL_MEMORY_STOLEN_LOCAL);

}



/**

 * __i915_gem_object_is_lmem - Whether the object is resident in

 * lmem while in the fence signaling critical path.

 * @obj: The object to check.

 *

 * This function is intended to be called from within the fence signaling

 * path where the fence, or a pin, keeps the object from being migrated. For

 * example during gpu reset or similar.

 *

 * Return: Whether the object is resident in lmem.

 */

bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)

{

	struct intel_memory_region *mr = READ_ONCE(obj->mm.region);



#ifdef CONFIG_LOCKDEP

	GEM_WARN_ON(dma_resv_test_signaled(obj->base.resv, DMA_RESV_USAGE_BOOKKEEP) &&

		    i915_gem_object_evictable(obj));

#endif

	return mr && (mr->type == INTEL_MEMORY_LOCAL ||

		      mr->type == INTEL_MEMORY_STOLEN_LOCAL);

}



/**

 * __i915_gem_object_create_lmem_with_ps - Create lmem object and force the

 * minimum page size for the backing pages.

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

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj, 


bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj);



bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj);



struct drm_i915_gem_object *

i915_gem_object_create_lmem_from_data(struct drm_i915_private *i915,

				      const void *data, size_t size);

drivers/gpu/drm/i915/gt/intel_reset.c

+5 −1
Original line number Diff line number Diff line
@@ -1113,6 +1113,7 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt) 
		 * Warn CI about the unrecoverable wedged condition.

		 * Time for a reboot.

		 */

		gt_err(gt, "Unrecoverable wedged condition\n");

		add_taint_for_CI(gt->i915, TAINT_WARN);

		return false;

	}
@@ -1264,8 +1265,10 @@ void intel_gt_reset(struct intel_gt *gt, 
	}



	ret = resume(gt);

	if (ret)

	if (ret) {

		gt_err(gt, "Failed to resume (%d)\n", ret);

		goto taint;

	}



finish:

	reset_finish(gt, awake);
@@ -1608,6 +1611,7 @@ void intel_gt_set_wedged_on_init(struct intel_gt *gt) 
	set_bit(I915_WEDGED_ON_INIT, &gt->reset.flags);



	/* Wedged on init is non-recoverable */

	gt_err(gt, "Non-recoverable wedged on init\n");

	add_taint_for_CI(gt->i915, TAINT_WARN);

}

drivers/gpu/drm/i915/gt/intel_ring.c

+0 −24
Original line number Diff line number Diff line
@@ -308,30 +308,6 @@ u32 *intel_ring_begin(struct i915_request *rq, unsigned int num_dwords) 
	return cs;

}



/* Align the ring tail to a cacheline boundary */

int intel_ring_cacheline_align(struct i915_request *rq)

{

	int num_dwords;

	void *cs;



	num_dwords = (rq->ring->emit & (CACHELINE_BYTES - 1)) / sizeof(u32);

	if (num_dwords == 0)

		return 0;



	num_dwords = CACHELINE_DWORDS - num_dwords;

	GEM_BUG_ON(num_dwords & 1);



	cs = intel_ring_begin(rq, num_dwords);

	if (IS_ERR(cs))

		return PTR_ERR(cs);



	memset64(cs, (u64)MI_NOOP << 32 | MI_NOOP, num_dwords / 2);

	intel_ring_advance(rq, cs + num_dwords);



	GEM_BUG_ON(rq->ring->emit & (CACHELINE_BYTES - 1));

	return 0;

}



#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)

#include "selftest_ring.c"

#endif

drivers/gpu/drm/i915/gt/intel_ring.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ struct intel_ring * 
intel_engine_create_ring(struct intel_engine_cs *engine, int size);



u32 *intel_ring_begin(struct i915_request *rq, unsigned int num_dwords);

int intel_ring_cacheline_align(struct i915_request *rq);



unsigned int intel_ring_update_space(struct intel_ring *ring);