Commit 4adbcff2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-10-10' of... 

Merge tag 'drm-intel-fixes-2019-10-10' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix CML display by adding a missing ID.
- Drop redundant list_del_init
- Only enqueue already completed requests to avoid races
- Fixup preempt-to-busy vs reset of a virtual request
- Protect peeking at execlists->active
- execlists->active is serialised by the tasklet

drm-intel-next-fixes-2019-09-19:
- Extend old HSW workaround to fix some GPU hangs on Haswell GT2
- Fix return error code on GEM mmap.
- White list a chicken bit register for push constants legacy mode on Mesa
- Fix resume issue related to GGTT restore
- Remove incorrect BUG_ON on execlist's schedule-out
- Fix unrecoverable GPU hangs with Vulkan compute workloads on SKL

drm-intel-next-fixes-2019-09-26:
- Fix concurrence on cases where requests where getting retired at same time as resubmitted to HW
- Fix gen9 display resolutions by setting the right max plane width
- Fix GPU hang on preemption
- Mark contents as dirty on a write fault. This was breaking cursor sprite with dumb buffers.

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010143039.GA15313@intel.com
parents 46fe219d e137d3ab

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

+14 −1
Original line number Diff line number Diff line
@@ -3280,7 +3280,20 @@ static int skl_max_plane_width(const struct drm_framebuffer *fb, 
	switch (fb->modifier) {

	case DRM_FORMAT_MOD_LINEAR:

	case I915_FORMAT_MOD_X_TILED:

		/*

		 * Validated limit is 4k, but has 5k should

		 * work apart from the following features:

		 * - Ytile (already limited to 4k)

		 * - FP16 (already limited to 4k)

		 * - render compression (already limited to 4k)

		 * - KVMR sprite and cursor (don't care)

		 * - horizontal panning (TODO verify this)

		 * - pipe and plane scaling (TODO verify this)

		 */

		if (cpp == 8)

			return 4096;

		else

			return 5120;

	case I915_FORMAT_MOD_Y_TILED_CCS:

	case I915_FORMAT_MOD_Yf_TILED_CCS:

		/* FIXME AUX plane? */

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

+7 −5
Original line number Diff line number Diff line
@@ -245,11 +245,9 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) 


	wakeref = intel_runtime_pm_get(rpm);



	srcu = intel_gt_reset_trylock(ggtt->vm.gt);

	if (srcu < 0) {

		ret = srcu;

	ret = intel_gt_reset_trylock(ggtt->vm.gt, &srcu);

	if (ret)

		goto err_rpm;

	}



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)
@@ -318,7 +316,11 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) 
		intel_wakeref_auto(&i915->ggtt.userfault_wakeref,

				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));



	if (write) {

		GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));

		i915_vma_set_ggtt_write(vma);

		obj->mm.dirty = true;

	}



err_fence:

	i915_vma_unpin_fence(vma);

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

+0 −3
Original line number Diff line number Diff line
@@ -241,9 +241,6 @@ void i915_gem_resume(struct drm_i915_private *i915) 
	mutex_lock(&i915->drm.struct_mutex);

	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);



	i915_gem_restore_gtt_mappings(i915);

	i915_gem_restore_fences(i915);



	if (i915_gem_init_hw(i915))

		goto err_wedged;

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

+14 −0
Original line number Diff line number Diff line
@@ -136,6 +136,20 @@ execlists_active(const struct intel_engine_execlists *execlists) 
	return READ_ONCE(*execlists->active);

}



static inline void

execlists_active_lock_bh(struct intel_engine_execlists *execlists)

{

	local_bh_disable(); /* prevent local softirq and lock recursion */

	tasklet_lock(&execlists->tasklet);

}



static inline void

execlists_active_unlock_bh(struct intel_engine_execlists *execlists)

{

	tasklet_unlock(&execlists->tasklet);

	local_bh_enable(); /* restore softirq, and kick ksoftirqd! */

}



struct i915_request *

execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists);

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

+7 −9
Original line number Diff line number Diff line
@@ -1197,9 +1197,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, 
					 struct drm_printer *m)

{

	struct drm_i915_private *dev_priv = engine->i915;

	const struct intel_engine_execlists * const execlists =

		&engine->execlists;

	unsigned long flags;

	struct intel_engine_execlists * const execlists = &engine->execlists;

	u64 addr;



	if (engine->id == RENDER_CLASS && IS_GEN_RANGE(dev_priv, 4, 7))
@@ -1281,7 +1279,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, 
				   idx, hws[idx * 2], hws[idx * 2 + 1]);

		}



		spin_lock_irqsave(&engine->active.lock, flags);

		execlists_active_lock_bh(execlists);

		for (port = execlists->active; (rq = *port); port++) {

			char hdr[80];

			int len;
@@ -1309,7 +1307,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, 
				 hwsp_seqno(rq));

			print_request(m, rq, hdr);

		}

		spin_unlock_irqrestore(&engine->active.lock, flags);

		execlists_active_unlock_bh(execlists);

	} else if (INTEL_GEN(dev_priv) > 6) {

		drm_printf(m, "\tPP_DIR_BASE: 0x%08x\n",

			   ENGINE_READ(engine, RING_PP_DIR_BASE));
@@ -1440,8 +1438,8 @@ int intel_enable_engine_stats(struct intel_engine_cs *engine) 
	if (!intel_engine_supports_stats(engine))

		return -ENODEV;



	spin_lock_irqsave(&engine->active.lock, flags);

	write_seqlock(&engine->stats.lock);

	execlists_active_lock_bh(execlists);

	write_seqlock_irqsave(&engine->stats.lock, flags);



	if (unlikely(engine->stats.enabled == ~0)) {

		err = -EBUSY;
@@ -1469,8 +1467,8 @@ int intel_enable_engine_stats(struct intel_engine_cs *engine) 
	}



unlock:

	write_sequnlock(&engine->stats.lock);

	spin_unlock_irqrestore(&engine->active.lock, flags);

	write_sequnlock_irqrestore(&engine->stats.lock, flags);

	execlists_active_unlock_bh(execlists);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE