Re: Patch "Revert "drm/i915: Don't skip request retirement if the active list is empty"" has been added to the 4.0-stable tree

[Jani Nikula <jani.nikula@intel.com>]

On Tue, 23 Jun 2015, gregkh@linuxfoundation.org wrote:
> This is a note to let you know that I've just added the patch titled
>
>     Revert "drm/i915: Don't skip request retirement if the active list is empty"
>
> to the 4.0-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:
>      revert-drm-i915-don-t-skip-request-retirement-if-the-active-list-is-empty.patch
> and it can be found in the queue-4.0 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.

http://mid.gmane.org/87h9py288m.fsf@intel.com

BR,
Jani.



>
>
> From 245ec9d85696c3e539b23e210f248698b478379c Mon Sep 17 00:00:00 2001
> From: Jani Nikula <jani.nikula@intel.com>
> Date: Mon, 15 Jun 2015 12:59:37 +0300
> Subject: Revert "drm/i915: Don't skip request retirement if the active list is empty"
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> From: Jani Nikula <jani.nikula@intel.com>
>
> commit 245ec9d85696c3e539b23e210f248698b478379c upstream.
>
> This reverts commit 0aedb1626566efd72b369c01992ee7413c82a0c5.
>
> I messed things up while applying [1] to drm-intel-fixes. Rectify.
>
> [1] http://mid.gmane.org/1432827156-9605-1-git-send-email-ville.syrjala@linux.intel.com
>
> Fixes: 0aedb1626566 ("drm/i915: Don't skip request retirement if the active list is empty")
> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>  drivers/gpu/drm/i915/i915_gem.c |    3 +++
>  1 file changed, 3 insertions(+)
>
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2732,6 +2732,9 @@ void i915_gem_reset(struct drm_device *d
>  void
>  i915_gem_retire_requests_ring(struct intel_engine_cs *ring)
>  {
> +	if (list_empty(&ring->request_list))
> +		return;
> +
>  	WARN_ON(i915_verify_lists(ring->dev));
>  
>  	/* Retire requests first as we use it above for the early return.
>
>
> Patches currently in stable-queue which might be from jani.nikula@intel.com are
>
> queue-4.0/revert-drm-i915-don-t-skip-request-retirement-if-the-active-list-is-empty.patch
> queue-4.0/drm-i915-always-reset-vma-ggtt_view.pages-cache-on-unbinding.patch

-- 
Jani Nikula, Intel Open Source Technology Center