This is a note to let you know that I've just added the patch titled
drm/i95: Initialize active ring->pid to -1
to the 3.15-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:
drm-i95-initialize-active-ring-pid-to-1.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From eee73b46261325eb140d899b5371f49b02d88f63 Mon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Tue, 10 Jun 2014 12:09:29 +0100
Subject: drm/i95: Initialize active ring->pid to -1
From: Chris Wilson <[email protected]>
commit eee73b46261325eb140d899b5371f49b02d88f63 upstream.
Otherwise we print out spurious processes on unused rings in the error
state.
Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -894,6 +894,8 @@ static void i915_gem_record_rings(struct
for (i = 0; i < I915_NUM_RINGS; i++) {
struct intel_ring_buffer *ring = &dev_priv->ring[i];
+ error->ring[i].pid = -1;
+
if (ring->dev == NULL)
continue;
@@ -901,7 +903,6 @@ static void i915_gem_record_rings(struct
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
Patches currently in stable-queue which might be from [email protected]
are
queue-3.15/drm-i95-initialize-active-ring-pid-to-1.patch
queue-3.15/drm-i915-hold-the-table-lock-whilst-walking-the-file-s-idr-and-counting-the-objects-in-debugfs.patch
queue-3.15/drm-i915-disable-fbc-by-default-also-on-haswell-and-later.patch
queue-3.15/drm-i915-reorder-semaphore-deadlock-check.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
