From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
Subject: Re: [Intel-gfx] [PATCH] drm/i95: Initialize active ring->pid to -1
Date: Tue, 10 Jun 2014 19:39:02 +0300 [thread overview]
Message-ID: <8761k8u3bt.fsf@intel.com> (raw)
In-Reply-To: <20140610133025.GM5821@phenom.ffwll.local>
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
prev parent reply other threads:[~2014-06-10 16:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=8761k8u3bt.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox