Message ID | 1448278932-31551-20-git-send-email-John.C.Harrison@Intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 0697fc3..a40c947 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1084,13 +1084,12 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring, continue; } - if (!error->ccid) - continue; - if (i915.enable_execlists) base += LRC_PPHWSP_PN * PAGE_SIZE; - if (base == (error->ccid & PAGE_MASK)) + if (error->ccid && base == (error->ccid & PAGE_MASK)) + ering->ctx = i915_error_ggtt_object_create(dev_priv, obj); + else if (((base ^ ering->ctx_desc) & 0x00000000FFFFF000ULL) == 0) ering->ctx = i915_error_ggtt_object_create(dev_priv, obj); } }