From: Sagar Arun Kamble <[email protected]> If GuC logs are being captured, there should be a force log buffer flush action sent to GuC before proceeding with GPU reset and re-initializing GUC. Those logs would be useful to understand why the GPU reset was initiated.
Signed-off-by: Sagar Arun Kamble <[email protected]> Signed-off-by: Akash Goel <[email protected]> --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.c | 3 +++ drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index f20e352..72506f0 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -1402,6 +1402,24 @@ int intel_guc_resume(struct drm_device *dev) return host2guc_action(guc, data, ARRAY_SIZE(data)); } +int i915_guc_log_buffer_force_flush(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_guc *guc = &dev_priv->guc; + u32 data[2]; + int ret = 0; + + data[0] = HOST2GUC_ACTION_FORCE_LOGBUFFERFLUSH; + data[1] = 0; + + if (host2guc_action(guc, data, 2)) { + ret = -EINVAL; + DRM_ERROR("Failed\n"); + } + + return ret; +} + void i915_guc_capture_logs(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 6cea65b..a78db29 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2812,6 +2812,9 @@ void i915_handle_error(struct drm_i915_private *dev_priv, vscnprintf(error_msg, sizeof(error_msg), fmt, args); va_end(args); + flush_work(&dev_priv->guc.events_work); + i915_guc_log_buffer_force_flush(dev_priv->dev); + i915_capture_error_state(dev_priv, engine_mask, error_msg); i915_report_and_clear_eir(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 5bb44b5..e3c4e08 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -188,6 +188,7 @@ int i915_guc_wq_check_space(struct drm_i915_gem_request *rq); int i915_guc_submit(struct drm_i915_gem_request *rq); void i915_guc_submission_disable(struct drm_device *dev); void i915_guc_submission_fini(struct drm_device *dev); +int i915_guc_log_buffer_force_flush(struct drm_device *dev); void i915_guc_capture_logs(struct drm_device *dev); ssize_t i915_guc_read_logs(struct intel_guc_log_client *log_client, size_t count, uint32_t f_flags); -- 1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
