Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index b7e9fddef270..8bc76fcff70d 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1194,6 +1194,7 @@ static void error_record_engine_registers(struct i915_gpu_state *error,
                         switch (engine->id) {
                         default:
                                 MISSING_CASE(engine->id);
+                                /* fall through */
                         case RCS0:
                                 mmio = RENDER_HWS_PGA_GEN7;
                                 break;
@@ -1417,6 +1418,7 @@ static void gem_record_rings(struct i915_gpu_state *error)
                 struct intel_engine_cs *engine = i915->engine[i];
                 struct drm_i915_error_engine *ee = &error->engine[i];
                 struct i915_request *request;
+                unsigned long flags;
 
                 ee->engine_id = -1;
 
@@ -1428,10 +1430,11 @@ static void gem_record_rings(struct i915_gpu_state *error)
                 error_record_engine_registers(error, engine, ee);
                 error_record_engine_execlists(engine, ee);
 
+                spin_lock_irqsave(&engine->active.lock, flags);
                 request = intel_engine_find_active_request(engine);
                 if (request) {
                         struct i915_gem_context *ctx = request->gem_context;
-                        struct intel_ring *ring;
+                        struct intel_ring *ring = request->ring;
 
                         ee->vm = ctx->vm ?: &ggtt->vm;
 
@@ -1461,7 +1464,6 @@ static void gem_record_rings(struct i915_gpu_state *error)
                         ee->rq_post = request->postfix;
                         ee->rq_tail = request->tail;
 
-                        ring = request->ring;
                         ee->cpu_ring_head = ring->head;
                         ee->cpu_ring_tail = ring->tail;
                         ee->ringbuffer =
@@ -1469,6 +1471,7 @@ static void gem_record_rings(struct i915_gpu_state *error)
 
                         engine_record_requests(engine, request, ee);
                 }
+                spin_unlock_irqrestore(&engine->active.lock, flags);
 
                 ee->hws_page =
                         i915_error_object_create(i915,