Commit 72ca70ac authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2022-09-16' of... 

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

 into drm-next

Cross-subsystem Changes:

- MEI subsystem pieces for XeHP SDV GSC support
  These are Acked-by Greg.

Driver Changes:

- Release mmaps on RPM suspend on discrete GPUs (Anshuman)
- Update GuC version to 7.5 on DG1, DG2 and ADL
- Revert "drm/i915/dg2: extend Wa_1409120013 to DG2" (Lucas)
- MTL enabling incl. standalone media (Matt R, Lucas)
- Explicitly clear BB_OFFSET for new contexts on Gen8+ (Chris)
- Fix throttling / perf limit reason decoding (Ashutosh)
- XeHP SDV GSC support (Vitaly, Alexander, Tomas)

- Fix issues with overrding firmware file paths (John)
- Invert if-else ladders to check latest version first (Lucas)
- Cancel GuC engine busyness worker synchronously (Umesh)

- Skip applying copy engine fuses outside PVC (Lucas)
- Eliminate Gen10 frequency read function (Lucas)
- Static code checker fixes (Gaosheng)
- Selftest improvements (Chris)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YyQ4Jgl3cpGL1/As@jlahtine-mobl.ger.corp.intel.com
parents d1e2d6b7 8adc7188

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ gt-y += \ 
	gt/intel_ring.o \

	gt/intel_ring_submission.o \

	gt/intel_rps.o \

	gt/intel_sa_media.o \

	gt/intel_sseu.o \

	gt/intel_sseu_debugfs.o \

	gt/intel_timeline.o \

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

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ struct drm_i915_private; 
struct drm_i915_gem_object;

struct intel_memory_region;



extern const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops;



void __iomem *

i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,

			    unsigned long n,

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

+22 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) 
	vma->mmo = mmo;



	if (CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)

		intel_wakeref_auto(&to_gt(i915)->ggtt->userfault_wakeref,

		intel_wakeref_auto(&to_gt(i915)->userfault_wakeref,

				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));



	if (write) {
@@ -550,6 +550,20 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj) 
	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

}



void i915_gem_object_runtime_pm_release_mmap_offset(struct drm_i915_gem_object *obj)

{

	struct ttm_buffer_object *bo = i915_gem_to_ttm(obj);

	struct ttm_device *bdev = bo->bdev;



	drm_vma_node_unmap(&bo->base.vma_node, bdev->dev_mapping);



	if (obj->userfault_count) {

		/* rpm wakeref provide exclusive access */

		list_del(&obj->userfault_link);

		obj->userfault_count = 0;

	}

}



void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj)

{

	struct i915_mmap_offset *mmo, *mn;
@@ -573,6 +587,13 @@ void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj) 
		spin_lock(&obj->mmo.lock);

	}

	spin_unlock(&obj->mmo.lock);



	if (obj->userfault_count) {

		mutex_lock(&to_gt(to_i915(obj->base.dev))->lmem_userfault_lock);

		list_del(&obj->userfault_link);

		mutex_unlock(&to_gt(to_i915(obj->base.dev))->lmem_userfault_lock);

		obj->userfault_count = 0;

	}

}



static struct i915_mmap_offset *

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

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ int i915_gem_dumb_mmap_offset(struct drm_file *file_priv, 
void __i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj);

void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj);



void i915_gem_object_runtime_pm_release_mmap_offset(struct drm_i915_gem_object *obj);

void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj);



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void __i915_gem_object_free_mmaps(struct drm_i915_gem_object *obj) 
{

	/* Skip serialisation and waking the device if known to be not used. */



	if (obj->userfault_count)

	if (obj->userfault_count && !IS_DGFX(to_i915(obj->base.dev)))

		i915_gem_object_release_mmap_gtt(obj);



	if (!RB_EMPTY_ROOT(&obj->mmo.offsets)) {