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

Merge tag 'drm-intel-fixes-2023-09-21' of... 

Merge tag 'drm-intel-fixes-2023-09-21' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Prevent error pointer dereference (Dan Carpenter)
- Fix PMU busyness values when using GuC mode (Umesh)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZQxf267jxc7tiIlZ@intel.com
parents f675553d c524cd40

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

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id, 
		DRIVER_CAPS(i915)->has_logical_contexts = true;



	ewma__engine_latency_init(&engine->latency);

	seqcount_init(&engine->stats.execlists.lock);



	ATOMIC_INIT_NOTIFIER_HEAD(&engine->context_status_notifier);

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

+2 −0
Original line number Diff line number Diff line
@@ -3550,6 +3550,8 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) 
	logical_ring_default_vfuncs(engine);

	logical_ring_default_irqs(engine);



	seqcount_init(&engine->stats.execlists.lock);



	if (engine->flags & I915_ENGINE_HAS_RCS_REG_STATE)

		rcs_submission_override(engine);

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

+3 −2
Original line number Diff line number Diff line
@@ -1094,6 +1094,9 @@ __lrc_alloc_state(struct intel_context *ce, struct intel_engine_cs *engine) 
					  I915_BO_ALLOC_PM_VOLATILE);

	if (IS_ERR(obj)) {

		obj = i915_gem_object_create_shmem(engine->i915, context_size);

		if (IS_ERR(obj))

			return ERR_CAST(obj);



		/*

		 * Wa_22016122933: For Media version 13.0, all Media GT shared

		 * memory needs to be mapped as WC on CPU side and UC (PAT
@@ -1102,8 +1105,6 @@ __lrc_alloc_state(struct intel_context *ce, struct intel_engine_cs *engine) 
		if (intel_gt_needs_wa_22016122933(engine->gt))

			i915_gem_object_set_cache_coherency(obj, I915_CACHE_NONE);

	}

	if (IS_ERR(obj))

		return ERR_CAST(obj);



	vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);

	if (IS_ERR(vma)) {