* [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
@ 2015-06-15 9:59 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2015-06-15 9:59 UTC (permalink / raw)
To: intel-gfx; +Cc: stable, ville.syrjala, jani.nikula
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
@ 2015-06-15 9:59 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2015-06-15 9:59 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, stable
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>
---
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
2015-06-15 9:59 ` Jani Nikula
@ 2015-06-15 10:37 ` Ville Syrjälä
-1 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2015-06-15 10:37 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, stable
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
@ 2015-06-15 10:37 ` Ville Syrjälä
0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2015-06-15 10:37 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, stable
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty"
2015-06-15 10:37 ` Ville Syrjälä
(?)
@ 2015-06-15 11:35 ` Jani Nikula
-1 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2015-06-15 11:35 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, stable
On Mon, 15 Jun 2015, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> 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>
Pushed to drm-intel-fixes.
BR,
Jani.
>
> 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
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-15 11:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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ä
2015-06-15 10:37 ` Ville Syrjälä
2015-06-15 11:35 ` Jani Nikula
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.