Commit 242eb7b0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2022-11-18' of... 

Merge tag 'drm-intel-gt-next-2022-11-18' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

Core Changes:

- Backmerge of drm-next

Driver Changes:

- Restore probe_range behaviour for userptr (Matt A)
- Fix use-after-free on lmem_userfault_list (Matt A)
- Never purge busy TTM objects (Matt A)
- Meteorlake enabling (Daniele, Badal, Daniele, Stuart, Aravind, Alan)
- Demote GuC kernel contexts to normal priority (John)

- Use RC6 residency types as arguments to residency functions (Ashutosh,
  Rodrigo, Jani)
- Convert some legacy DRM debugging macros to new ones (Tvrtko)
- Don't deadlock GuC busyness stats vs reset (John)
- Remove excessive line feeds in GuC state dumps (John)
- Use i915_sg_dma_sizes() for all backends (Matt A)
- Prefer REG_FIELD_GET in intel_rps_get_cagf (Ashutosh, Rodrigo)
- Use GEN12_RPSTAT register for GT freq (Don, Badal, Ashutosh)
- Remove unwanted TTM ghost obj check (Matt A)
- Update workaround documentation (Lucas)

- Coding style and static checker fixes and cleanups
  (Jani, Umesh, Tvrtko, Lucas, Andrzej)
- Selftest improvements (Chris, Daniele, Riana, Andrzej)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y3dMd9HDpfDehhWm@jlahtine-mobl.ger.corp.intel.com
parents fc58764b 4bb9ca7e

Documentation/gpu/drm-usage-stats.rst

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ percentage utilization of the engine, whereas drm-engine-<str> only reflects 
time active without considering what frequency the engine is operating as a

percentage of it's maximum frequency.



===============================

Driver specific implementations

===============================

Documentation/gpu/i915.rst

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ WOPCM 
WOPCM Layout

~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/i915/intel_wopcm.c

.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_wopcm.c

   :doc: WOPCM Layout



GuC

drivers/gpu/drm/i915/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -127,9 +127,11 @@ gt-y += \ 
	gt/intel_sseu.o \

	gt/intel_sseu_debugfs.o \

	gt/intel_timeline.o \

	gt/intel_wopcm.o \

	gt/intel_workarounds.o \

	gt/shmem_utils.o \

	gt/sysfs_engines.o



# x86 intel-gtt module support

gt-$(CONFIG_X86) += gt/intel_ggtt_gmch.o

# autogenerated null render state
@@ -183,8 +185,7 @@ i915-y += \ 
	  i915_trace_points.o \

	  i915_ttm_buddy_manager.o \

	  i915_vma.o \

	  i915_vma_resource.o \

	  intel_wopcm.o

	  i915_vma_resource.o



# general-purpose microcontroller (GuC) support

i915-y += gt/uc/intel_uc.o \

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

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ set_proto_ctx_engines_bond(struct i915_user_extension __user *base, void *data) 
	}



	if (intel_engine_uses_guc(master)) {

		DRM_DEBUG("bonding extension not supported with GuC submission");

		drm_dbg(&i915->drm, "bonding extension not supported with GuC submission");

		return -ENODEV;

	}

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

+1 −3
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) 
{

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

	struct sg_table *sgt;

	unsigned int sg_page_sizes;



	assert_object_held(obj);
@@ -264,8 +263,7 @@ static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) 
	    (!HAS_LLC(i915) && !IS_DG1(i915)))

		wbinvd_on_all_cpus();



	sg_page_sizes = i915_sg_dma_sizes(sgt->sgl);

	__i915_gem_object_set_pages(obj, sgt, sg_page_sizes);

	__i915_gem_object_set_pages(obj, sgt);



	return 0;

}