From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48758 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934129AbdDFIHU (ORCPT ); Thu, 6 Apr 2017 04:07:20 -0400 Subject: Patch "drm/i915: Let execlist_update_context() cover !FULL_PPGTT mode." has been added to the 4.10-stable tree To: zhi.a.wang@intel.com, chris@chris-wilson.co.uk, gregkh@linuxfoundation.org, jani.nikula@intel.com, joonas.lahtinen@linux.intel.com, michal.winiarski@intel.com, michel.thierry@intel.com, tvrtko.ursulin@linux.intel.com, zhenyuw@linux.intel.com, zhiyuan.lv@intel.com Cc: , From: Date: Thu, 06 Apr 2017 10:07:04 +0200 Message-ID: <1491466024184254@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/i915: Let execlist_update_context() cover !FULL_PPGTT mode. to the 4.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-i915-let-execlist_update_context-cover-full_ppgtt-mode.patch and it can be found in the queue-4.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 26d12c619476ccbc6725aa4a17dcb1d41d5774e7 Mon Sep 17 00:00:00 2001 From: Zhi Wang Date: Mon, 6 Feb 2017 18:37:16 +0800 Subject: drm/i915: Let execlist_update_context() cover !FULL_PPGTT mode. From: Zhi Wang commit 26d12c619476ccbc6725aa4a17dcb1d41d5774e7 upstream. 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: 34869776c76b ("drm/i915: check ppgtt validity when init reg state") Cc: Tvrtko Ursulin Cc: Michal Winiarski Cc: Michel Thierry Cc: Joonas Lahtinen Cc: Chris Wilson Cc: Zhenyu Wang Cc: Zhiyuan Lv Signed-off-by: Zhi Wang Link: http://patchwork.freedesktop.org/patch/msgid/1486377436-15380-1-git-send-email-zhi.a.wang@intel.com Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson (cherry picked from commit 04da811b3d821567e7a9a8a0baf48a6c1718b582) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_lrc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -362,7 +362,8 @@ execlists_update_context_pdps(struct i91 static u64 execlists_update_context(struct drm_i915_gem_request *rq) { 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; reg_state[CTX_RING_TAIL+1] = rq->tail; Patches currently in stable-queue which might be from zhi.a.wang@intel.com are queue-4.10/drm-i915-let-execlist_update_context-cover-full_ppgtt-mode.patch queue-4.10/drm-i915-move-the-release-of-pt-page-to-the-upper-caller.patch queue-4.10/drm-i915-kvmgt-hold-struct-kvm-reference.patch queue-4.10/drm-i915-a-hotfix-for-making-aliasing-ppgtt-work-for-gvt-g.patch