public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i95: Initialize active ring->pid to -1
@ 2014-06-10 11:09 Chris Wilson
  2014-06-10 13:30 ` Daniel Vetter
  0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2014-06-10 11:09 UTC (permalink / raw)
  To: intel-gfx; +Cc: Chris Wilson, stable

Otherwise we print out spurious processes on unused rings in the error
state.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 87ec60e181a7..66cf41765bf9 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev,
 	for (i = 0; i < I915_NUM_RINGS; i++) {
 		struct intel_engine_cs *ring = &dev_priv->ring[i];
 
+		error->ring[i].pid = -1;
+
 		if (ring->dev == NULL)
 			continue;
 
@@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev,
 
 		i915_record_ring_state(dev, ring, &error->ring[i]);
 
-		error->ring[i].pid = -1;
 		request = i915_gem_find_active_request(ring);
 		if (request) {
 			/* We need to copy these to an anonymous buffer
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i95: Initialize active ring->pid to -1
  2014-06-10 11:09 [PATCH] drm/i95: Initialize active ring->pid to -1 Chris Wilson
@ 2014-06-10 13:30 ` Daniel Vetter
  2014-06-10 13:46   ` [Intel-gfx] " Chris Wilson
  2014-06-10 16:39   ` Jani Nikula
  0 siblings, 2 replies; 4+ messages in thread
From: Daniel Vetter @ 2014-06-10 13:30 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx, stable

On Tue, Jun 10, 2014 at 12:09:29PM +0100, Chris Wilson wrote:
> Otherwise we print out spurious processes on unused rings in the error
> state.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org

Personally would have done that in the dumper code, not the recording code
- this here looks a bit inconsistent. Either way this is
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 87ec60e181a7..66cf41765bf9 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev,
>  	for (i = 0; i < I915_NUM_RINGS; i++) {
>  		struct intel_engine_cs *ring = &dev_priv->ring[i];
>  
> +		error->ring[i].pid = -1;
> +
>  		if (ring->dev == NULL)
>  			continue;
>  
> @@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev,
>  
>  		i915_record_ring_state(dev, ring, &error->ring[i]);
>  
> -		error->ring[i].pid = -1;
>  		request = i915_gem_find_active_request(ring);
>  		if (request) {
>  			/* We need to copy these to an anonymous buffer
> -- 
> 2.0.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i95: Initialize active ring->pid to -1
  2014-06-10 13:30 ` Daniel Vetter
@ 2014-06-10 13:46   ` Chris Wilson
  2014-06-10 16:39   ` Jani Nikula
  1 sibling, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2014-06-10 13:46 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx, stable

On Tue, Jun 10, 2014 at 03:30:25PM +0200, Daniel Vetter wrote:
> On Tue, Jun 10, 2014 at 12:09:29PM +0100, Chris Wilson wrote:
> > Otherwise we print out spurious processes on unused rings in the error
> > state.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: stable@vger.kernel.org
> 
> Personally would have done that in the dumper code, not the recording code
> - this here looks a bit inconsistent. Either way this is

It gets used in multiple locations, in particular inside the capture
code itself, so it looked simpler to initialise it always.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i95: Initialize active ring->pid to -1
  2014-06-10 13:30 ` Daniel Vetter
  2014-06-10 13:46   ` [Intel-gfx] " Chris Wilson
@ 2014-06-10 16:39   ` Jani Nikula
  1 sibling, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2014-06-10 16:39 UTC (permalink / raw)
  To: Daniel Vetter, Chris Wilson; +Cc: intel-gfx, stable

On Tue, 10 Jun 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Jun 10, 2014 at 12:09:29PM +0100, Chris Wilson wrote:
>> Otherwise we print out spurious processes on unused rings in the error
>> state.
>> 
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: stable@vger.kernel.org
>
> Personally would have done that in the dumper code, not the recording code
> - this here looks a bit inconsistent. Either way this is
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Pushed to -fixes, thanks for the patch and review.

BR,
Jani.


>> ---
>>  drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>> index 87ec60e181a7..66cf41765bf9 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>> @@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev,
>>  	for (i = 0; i < I915_NUM_RINGS; i++) {
>>  		struct intel_engine_cs *ring = &dev_priv->ring[i];
>>  
>> +		error->ring[i].pid = -1;
>> +
>>  		if (ring->dev == NULL)
>>  			continue;
>>  
>> @@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev,
>>  
>>  		i915_record_ring_state(dev, ring, &error->ring[i]);
>>  
>> -		error->ring[i].pid = -1;
>>  		request = i915_gem_find_active_request(ring);
>>  		if (request) {
>>  			/* We need to copy these to an anonymous buffer
>> -- 
>> 2.0.0
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-10 16:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-10 11:09 [PATCH] drm/i95: Initialize active ring->pid to -1 Chris Wilson
2014-06-10 13:30 ` Daniel Vetter
2014-06-10 13:46   ` [Intel-gfx] " Chris Wilson
2014-06-10 16:39   ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox