From: Sagar Arun Kamble <sagar.a.kam...@intel.com>
This patch provides debugfs interface i915_guc_output_control for
on the fly enabling/disabling of logging in GuC firmware and controlling
the verbosity level of logs.
v2: Add a forceful flush, to collect left over logs, on disabling logging.
Useful for Validation.
Signed-off-by: Sagar Arun Kamble <sagar.a.kam...@intel.com>
Signed-off-by: Akash Goel <akash.g...@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 35 +++++++++++++++++++-
drivers/gpu/drm/i915/i915_guc_submission.c | 52 ++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_guc.h | 1 +
3 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.c
index f664884..3dd29af 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2629,6 +2629,38 @@ static int i915_guc_log_dump(struct seq_file *m, void
*data)
return 0;
}
+static int
+i915_guc_log_control_set(void *data, u64 val)
+{
+ struct drm_device *dev = data;
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
+ struct intel_guc *guc = &dev_priv->guc;
+ int ret;
+
+ if (!HAS_GUC_UCODE(dev))
+ return -EINVAL;
+
+ if (!i915.enable_guc_submission)
+ return -EINVAL;
+
+ if (guc_fw->guc_fw_load_status != GUC_FIRMWARE_SUCCESS)
+ return -EINVAL;
+
+ if (!guc->log_obj || !guc->log_relay_chan)
+ return -EINVAL;
+
+ intel_runtime_pm_get(dev_priv);
+ ret = i915_guc_log_control(dev, val);
+ intel_runtime_pm_put(dev_priv);
+
+ return ret;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_control_fops,
+ NULL, i915_guc_log_control_set,
+ "0x%08llx\n");
+
static int i915_edp_psr_status(struct seq_file *m, void *data)
{
struct drm_info_node *node = m->private;
@@ -5491,7 +5523,8 @@ static const struct i915_debugfs_files {
{"i915_fbc_false_color", &i915_fbc_fc_fops},
{"i915_dp_test_data", &i915_displayport_test_data_fops},
{"i915_dp_test_type", &i915_displayport_test_type_fops},
- {"i915_dp_test_active", &i915_displayport_test_active_fops}
+ {"i915_dp_test_active", &i915_displayport_test_active_fops},
+ {"i915_guc_log_control", &i915_guc_log_control_fops}
};
void intel_display_crc_init(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c
b/drivers/gpu/drm/i915/i915_guc_submission.c
index a32346a..fd26a9e 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -168,6 +168,16 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
return host2guc_action(guc, data, ARRAY_SIZE(data));
}
+static int host2guc_logging_control(struct intel_guc *guc, u32 control_val)
+{
+ u32 data[2];
+
+ data[0] = HOST2GUC_ACTION_UK_LOG_ENABLE_LOGGING;
+ data[1] = control_val;
+
+ return host2guc_action(guc, data, 2);
+}
+
static int host2guc_force_logbuffer_flush(struct intel_guc *guc)
{
u32 data[2];
@@ -1306,3 +1316,45 @@ void i915_guc_capture_logs_on_reset(struct drm_device
*dev)
/* GuC would have updated the log buffer by now, so capture it */
i915_guc_capture_logs(dev);
}
+
+int i915_guc_log_control(struct drm_device *dev, uint64_t control_val)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc *guc = &dev_priv->guc;
+ union guc_log_control log_param;
+
+ log_param.logging_enabled = control_val & 0x1;
+ log_param.verbosity = (control_val >> 4) & 0xF;
+
+ if (log_param.verbosity < GUC_LOG_VERBOSITY_MIN ||
+ log_param.verbosity > GUC_LOG_VERBOSITY_MAX)
+ return -EINVAL;
+
+ if (!host2guc_logging_control(guc, log_param.value)) {
+ /* If log_level was set as -1 at boot time, then interrupt would
+ * not have been enabled. Can keep the interrupt on even when
+ * logging is being disabled at runtime, as GuC itself won't
+ * generate an interrupt in that case.
+ */
+ if (i915.guc_log_level < 0)
+ gen9_enable_guc_interrupts(dev_priv);
+
+ /* Once logging is disabled, GuC won't generate logs & send an
+ * interrupt. But there could be some data in the log buffer
+ * which is yet to be captured. So request GuC to update the log
+ * buffer state and send the flush interrupt so that Host can
+ * collect the left over logs also.
+ */
+ if (!log_param.logging_enabled) {
+ flush_work(&guc->events_work);
+ host2guc_force_logbuffer_flush(guc);
+ }
+
+ i915.guc_log_level = log_param.verbosity;
+ } else {
+ DRM_ERROR("Failed\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 1379df4..01a1bb5 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -171,5 +171,6 @@ void i915_guc_submission_disable(struct drm_i915_private
*dev_priv);
void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
void i915_guc_capture_logs(struct drm_device *dev);
void i915_guc_capture_logs_on_reset(struct drm_device *dev);
+int i915_guc_log_control(struct drm_device *dev, uint64_t control_val);
#endif
--
1.9.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
