All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
Date: Mon, 15 Jun 2015 13:37:04 +0300	[thread overview]
Message-ID: <20150615103704.GH5176@intel.com> (raw)
In-Reply-To: <1434362377-17489-1-git-send-email-jani.nikula@intel.com>

On Mon, Jun 15, 2015 at 12:59:37PM +0300, Jani Nikula wrote:
> 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")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>

Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

However this leaves us with an early bailout if request_list is empty.
Hopefully that won't cause other issues. I suppose we shouldn't have
stuff on the active_list w/o any pending requests.

> ---
> 
> Note to stable team: please do *not* backport
> 
> commit 0aedb1626566efd72b369c01992ee7413c82a0c5
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date:   Thu May 28 18:32:36 2015 +0300
> 
>     drm/i915: Don't skip request retirement if the active list is empty
> 
> but if you did, please backport this revert as well.
> 
> Thanks, and sorry.
> 
> BR,
> Jani.
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index c3806c66650a..2d0995e7afc3 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev)
>  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.
> -- 
> 2.1.4

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
Date: Mon, 15 Jun 2015 13:37:04 +0300	[thread overview]
Message-ID: <20150615103704.GH5176@intel.com> (raw)
In-Reply-To: <1434362377-17489-1-git-send-email-jani.nikula@intel.com>

On Mon, Jun 15, 2015 at 12:59:37PM +0300, Jani Nikula wrote:
> 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")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>

Acked-by: Ville Syrj�l� <ville.syrjala@linux.intel.com>

However this leaves us with an early bailout if request_list is empty.
Hopefully that won't cause other issues. I suppose we shouldn't have
stuff on the active_list w/o any pending requests.

> ---
> 
> Note to stable team: please do *not* backport
> 
> commit 0aedb1626566efd72b369c01992ee7413c82a0c5
> Author: Ville Syrj�l� <ville.syrjala@linux.intel.com>
> Date:   Thu May 28 18:32:36 2015 +0300
> 
>     drm/i915: Don't skip request retirement if the active list is empty
> 
> but if you did, please backport this revert as well.
> 
> Thanks, and sorry.
> 
> BR,
> Jani.
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index c3806c66650a..2d0995e7afc3 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev)
>  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.
> -- 
> 2.1.4

-- 
Ville Syrj�l�
Intel OTC

  reply	other threads:[~2015-06-15 10:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-15  9:59 [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty" Jani Nikula
2015-06-15  9:59 ` Jani Nikula
2015-06-15 10:37 ` Ville Syrjälä [this message]
2015-06-15 10:37   ` Ville Syrjälä
2015-06-15 11:35   ` Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150615103704.GH5176@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.