Commit 0c77ca2f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2020-05-07' of... 

Merge tag 'drm-intel-fixes-2020-05-07' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fixes on execlist to avoid GPU hang situation (Chris)
- Fixes couple deadlocks (Chris)
- Timeslice preemption fixes (Chris)
- Fix Display Port interrupt handling on Tiger Lake (Imre)
- Reduce debug noise around Frame Buffer Compression (Peter)
- Fix logic around IPC W/a for Coffee Lake and Kaby Lake (Sultan)
- Avoid dereferencing a dead context (Chris)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200508052437.GA3212215@intel.com
parents 2ef96a5b 1bc6a601

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

+1 −2
Original line number Diff line number Diff line
@@ -485,8 +485,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, 
	if (!ret)

		goto err_llb;

	else if (ret > 1) {

		DRM_INFO("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");



		DRM_INFO_ONCE("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");

	}



	fbc->threshold = ret;

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

+1 −6
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj) 
	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_vma *vma;



	GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));

	if (!atomic_read(&obj->bind_count))

		return;
@@ -400,12 +399,8 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj) 
void

i915_gem_object_unpin_from_display_plane(struct i915_vma *vma)

{

	struct drm_i915_gem_object *obj = vma->obj;



	assert_object_held(obj);



	/* Bump the LRU to try and avoid premature eviction whilst flipping  */

	i915_gem_object_bump_inactive_ggtt(obj);

	i915_gem_object_bump_inactive_ggtt(vma->obj);



	i915_vma_unpin(vma);

}

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

+7 −1
Original line number Diff line number Diff line
@@ -69,7 +69,13 @@ struct intel_context { 
#define CONTEXT_NOPREEMPT		7



	u32 *lrc_reg_state;

	u64 lrc_desc;

	union {

		struct {

			u32 lrca;

			u32 ccid;

		};

		u64 desc;

	} lrc;

	u32 tag; /* cookie passed to HW to track this context on submission */



	/* Time on GPU as tracked by the hw. */

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

+0 −9
Original line number Diff line number Diff line
@@ -333,13 +333,4 @@ intel_engine_has_preempt_reset(const struct intel_engine_cs *engine) 
	return intel_engine_has_preemption(engine);

}



static inline bool

intel_engine_has_timeslices(const struct intel_engine_cs *engine)

{

	if (!IS_ACTIVE(CONFIG_DRM_I915_TIMESLICE_DURATION))

		return false;



	return intel_engine_has_semaphores(engine);

}



#endif /* _INTEL_RINGBUFFER_H_ */

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

+6 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,12 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, 


	if (engine->id == RENDER_CLASS && IS_GEN_RANGE(dev_priv, 4, 7))

		drm_printf(m, "\tCCID: 0x%08x\n", ENGINE_READ(engine, CCID));

	if (HAS_EXECLISTS(dev_priv)) {

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

			   ENGINE_READ(engine, RING_EXECLIST_STATUS_HI));

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

			   ENGINE_READ(engine, RING_EXECLIST_STATUS_LO));

	}

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

		   ENGINE_READ(engine, RING_START));

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE