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

Merge tag 'drm-intel-gt-next-2023-09-28' of... 

Merge tag 'drm-intel-gt-next-2023-09-28' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

Driver Changes:

Fixes/improvements/new stuff:

- Fix TLB-Invalidation seqno store [mtl] (Alan Previn)
- Force a reset on internal GuC error [guc] (John Harrison)
- Define GSC fw [gsc] (Daniele Ceraolo Spurio)
- Update workaround 14016712196 [dg2/mtl] (Tejas Upadhyay)
- Mark requests for GuC virtual engines to avoid use-after-free (Andrzej Hajda)
- Add Wa_14015150844 [dg2/mtl] (Shekhar Chauhan)
- Prevent error pointer dereference (Dan Carpenter)
- Add Wa_18022495364 [tgl,adl,rpl] (Dnyaneshwar Bhadane)
- Fix GuC PMU by moving execlist stats initialization to execlist specific setup (Umesh Nerlige Ramappa)
- Fix PXP firmware load [pxp/mtl] (Alan Previn)
- Fix execution/context state of PXP contexts (Alan Previn)
- Limit the length of an sg list to the requested length (Matthew Wilcox)
- Fix reservation address in ggtt_reserve_guc_top [guc] (Javier Pello)
- Add Wa_18028616096 [dg2] (Shekhar Chauhan)
- Get runtime pm in busyness worker only if already active [guc/pmu] (Umesh Nerlige Ramappa)
- Don't set PIPE_CONTROL_FLUSH_L3 for aux inval (Nirmoy Das)

Future platform enablement:

- Fix and consolidate some workaround checks, make others IP version based [mtl] (Matt Roper)
- Replace Meteorlake subplatforms with IP version checks (Matt Roper)
- Adding DeviceID for Arrowlake-S under MTL [mtl] (Nemesa Garg)
- Run relevant bits of debugfs drop_caches per GT (Tvrtko Ursulin)

Miscellaneous:

- Remove Wa_15010599737 [dg2] (Shekhar Chauhan)
- Align igt_spinner_create_request with hangcheck [selftests] (Jonathan Cavitt)
- Remove pre-production workarounds [dg2] (Matt Roper)
- Tidy some workaround definitions (Matt Roper)
- Wait longer for tasks in migrate selftest [gt] (Jonathan Cavitt)
- Skip WA verification for GEN7_MISCCPCTL on DG2 [gt] (Andrzej Hajda)
- Silence injected failure in the load via GSC path [huc] (Daniele Ceraolo Spurio)
- Refactor deprecated strncpy (Justin Stitt)
- Update RC6 mask for mtl_drpc [debugfs/mtl] (Badal Nilawar)
- Remove a static inline that requires including i915_drv.h [gt] (Jani Nikula)
- Remove inlines from i915_gem_execbuffer.c [gem] (Jani Nikula)
- Remove gtt_offset from stream->oa_buffer.head/.tail [perf] (Ashutosh Dixit)
- Do not disable preemption for resets (Tvrtko Ursulin)

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

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

+1 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "skl_scaler.h"

#include "skl_universal_plane.h"

#include "skl_watermark.h"

#include "gt/intel_gt.h"

#include "pxp/intel_pxp.h"



static const u32 skl_plane_formats[] = {
@@ -2168,11 +2169,6 @@ skl_plane_disable_flip_done(struct intel_plane *plane) 
static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915,

				 enum pipe pipe, enum plane_id plane_id)

{

	/* Wa_14017240301 */

	if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||

	    IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))

		return false;



	/* Wa_22011186057 */

	if (IS_ALDERLAKE_P(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_B0))

		return false;

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

+2 −2
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ static int ext_set_pat(struct i915_user_extension __user *base, void *data) 
	BUILD_BUG_ON(sizeof(struct drm_i915_gem_create_ext_set_pat) !=

		     offsetofend(struct drm_i915_gem_create_ext_set_pat, rsvd));



	/* Limiting the extension only to Meteor Lake */

	if (!IS_METEORLAKE(i915))

	/* Limiting the extension only to Xe_LPG and beyond */

	if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 70))

		return -ENODEV;



	if (copy_from_user(&ext, base, sizeof(ext)))

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

+10 −10
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int eb_pin_engine(struct i915_execbuffer *eb, bool throttle); 
static void eb_unpin_engine(struct i915_execbuffer *eb);

static void eb_capture_release(struct i915_execbuffer *eb);



static inline bool eb_use_cmdparser(const struct i915_execbuffer *eb)

static bool eb_use_cmdparser(const struct i915_execbuffer *eb)

{

	return intel_engine_requires_cmd_parser(eb->context->engine) ||

		(intel_engine_using_cmd_parser(eb->context->engine) &&
@@ -433,7 +433,7 @@ static u64 eb_pin_flags(const struct drm_i915_gem_exec_object2 *entry, 
	return pin_flags;

}



static inline int

static int

eb_pin_vma(struct i915_execbuffer *eb,

	   const struct drm_i915_gem_exec_object2 *entry,

	   struct eb_vma *ev)
@@ -486,7 +486,7 @@ eb_pin_vma(struct i915_execbuffer *eb, 
	return 0;

}



static inline void

static void

eb_unreserve_vma(struct eb_vma *ev)

{

	if (unlikely(ev->flags & __EXEC_OBJECT_HAS_FENCE))
@@ -548,7 +548,7 @@ eb_validate_vma(struct i915_execbuffer *eb, 
	return 0;

}



static inline bool

static bool

is_batch_buffer(struct i915_execbuffer *eb, unsigned int buffer_idx)

{

	return eb->args->flags & I915_EXEC_BATCH_FIRST ?
@@ -628,7 +628,7 @@ eb_add_vma(struct i915_execbuffer *eb, 
	return 0;

}



static inline int use_cpu_reloc(const struct reloc_cache *cache,

static int use_cpu_reloc(const struct reloc_cache *cache,

			 const struct drm_i915_gem_object *obj)

{

	if (!i915_gem_object_has_struct_page(obj))
@@ -1107,7 +1107,7 @@ static void eb_destroy(const struct i915_execbuffer *eb) 
		kfree(eb->buckets);

}



static inline u64

static u64

relocation_target(const struct drm_i915_gem_relocation_entry *reloc,

		  const struct i915_vma *target)

{
@@ -1128,19 +1128,19 @@ static void reloc_cache_init(struct reloc_cache *cache, 
	cache->node.flags = 0;

}



static inline void *unmask_page(unsigned long p)

static void *unmask_page(unsigned long p)

{

	return (void *)(uintptr_t)(p & PAGE_MASK);

}



static inline unsigned int unmask_flags(unsigned long p)

static unsigned int unmask_flags(unsigned long p)

{

	return p & ~PAGE_MASK;

}



#define KMAP 0x4 /* after CLFLUSH_FLAGS */



static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)

static struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)

{

	struct drm_i915_private *i915 =

		container_of(cache, struct i915_execbuffer, reloc_cache)->i915;

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

+7 −4
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, 
	st->nents = 0;

	for (i = 0; i < page_count; i++) {

		struct folio *folio;

		unsigned long nr_pages;

		const unsigned int shrink[] = {

			I915_SHRINK_BOUND | I915_SHRINK_UNBOUND,

			0,
@@ -150,6 +151,8 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, 
			}

		} while (1);



		nr_pages = min_t(unsigned long,

				folio_nr_pages(folio), page_count - i);

		if (!i ||

		    sg->length >= max_segment ||

		    folio_pfn(folio) != next_pfn) {
@@ -157,13 +160,13 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915, struct sg_table *st, 
				sg = sg_next(sg);



			st->nents++;

			sg_set_folio(sg, folio, folio_size(folio), 0);

			sg_set_folio(sg, folio, nr_pages * PAGE_SIZE, 0);

		} else {

			/* XXX: could overflow? */

			sg->length += folio_size(folio);

			sg->length += nr_pages * PAGE_SIZE;

		}

		next_pfn = folio_pfn(folio) + folio_nr_pages(folio);

		i += folio_nr_pages(folio) - 1;

		next_pfn = folio_pfn(folio) + nr_pages;

		i += nr_pages - 1;



		/* Check that the i965g/gm workaround works. */

		GEM_BUG_ON(gfp & __GFP_DMA32 && next_pfn >= 0x00100000UL);

drivers/gpu/drm/i915/gem/selftests/mock_context.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ mock_context(struct drm_i915_private *i915, 
	if (name) {

		struct i915_ppgtt *ppgtt;



		strncpy(ctx->name, name, sizeof(ctx->name) - 1);

		strscpy(ctx->name, name, sizeof(ctx->name));



		ppgtt = mock_ppgtt(i915, name);

		if (!ppgtt)