Commit 26d12c61 authored Feb 06, 2017 by Zhi Wang Committed by Jani Nikula Feb 16, 2017

drm/i915: Let execlist_update_context() cover !FULL_PPGTT mode.



execlist_update_context() will try to update PDPs in a context before a
ELSP submission only for full PPGTT mode, while PDPs was populated during
context initialization. Now the latter code path is removed. Let
execlist_update_context() also cover !FULL_PPGTT mode.

Fixes: 34869776 ("drm/i915: check ppgtt validity when init reg state")
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhiyuan Lv <zhiyuan.lv@intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486377436-15380-1-git-send-email-zhi.a.wang@intel.com


Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 04da811b)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent 4b84b4a5

drivers/gpu/drm/i915/intel_lrc.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -360,7 +360,8 @@ execlists_update_context_pdps(struct i915_hw_ppgtt ppgtt, u32 reg_state)
	static u64 execlists_update_context(struct drm_i915_gem_request *rq)		static u64 execlists_update_context(struct drm_i915_gem_request *rq)
	{		{
	struct intel_context *ce = &rq->ctx->engine[rq->engine->id];		struct intel_context *ce = &rq->ctx->engine[rq->engine->id];
	struct i915_hw_ppgtt *ppgtt = rq->ctx->ppgtt;		struct i915_hw_ppgtt *ppgtt =
			rq->ctx->ppgtt ?: rq->i915->mm.aliasing_ppgtt;
	u32 *reg_state = ce->lrc_reg_state;		u32 *reg_state = ce->lrc_reg_state;

	reg_state[CTX_RING_TAIL+1] = rq->tail;		reg_state[CTX_RING_TAIL+1] = rq->tail;