From: Damien Lespiau <damien.lesp...@intel.com>
That can be handy later on to tell which DMC firmware version the user
has, by just looking at the dmesg or a debugfs file.
v2: use DRM_DEBUG_DRIVER (Chris)
Signed-off-by: Damien Lespiau <damien.lesp...@intel.com> (v1)
Signed-off-by: Mika Kuoppala <mika.kuopp...@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 7 +++++++
drivers/gpu/drm/i915/i915_drv.h | 5 +++++
drivers/gpu/drm/i915/intel_csr.c | 9 ++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.c
index ceae425..7a0592b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2782,6 +2782,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
struct drm_info_node *node = m->private;
struct drm_device *dev = node->minor->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_csr *csr = &dev_priv->csr;
enum csr_state csr_state;
static const char * const csr_state_str[] = {
"unknown", "loaded", "error"
@@ -2795,6 +2796,12 @@ static int i915_dmc_info(struct seq_file *m, void
*unused)
csr_state = intel_csr_load_status_get(dev_priv);
seq_printf(m, "status: %s\n", csr_state_str[csr_state]);
+ if (csr_state != FW_LOADED)
+ return 0;
+
+ seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
+ CSR_VERSION_MINOR(csr->version));
+
return 0;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 48a742c..1b1a989 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -736,6 +736,10 @@ struct intel_uncore {
#define for_each_fw_domain(domain__, dev_priv__, i__) \
for_each_fw_domain_mask(domain__, FORCEWAKE_ALL, dev_priv__, i__)
+#define CSR_VERSION(major, minor) ((major) << 16 | (minor))
+#define CSR_VERSION_MAJOR(version) ((version) >> 16)
+#define CSR_VERSION_MINOR(version) ((version) & 0xffff)
+
enum csr_state {
FW_UNINITIALIZED = 0,
FW_LOADED,
@@ -746,6 +750,7 @@ struct intel_csr {
const char *fw_path;
uint32_t *dmc_payload;
uint32_t dmc_fw_size;
+ uint32_t version;
uint32_t mmio_count;
uint32_t mmioaddr[8];
uint32_t mmiodata[8];
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 9e530a7..cabcc51 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -321,6 +321,9 @@ static void finish_csr_load(const struct firmware *fw, void
*context)
(css_header->header_len * 4));
goto out;
}
+
+ csr->version = css_header->version;
+
readcount += sizeof(struct intel_css_header);
/* Extract Package Header information*/
@@ -402,7 +405,11 @@ static void finish_csr_load(const struct firmware *fw,
void *context)
intel_csr_load_program(dev);
fw_loaded = true;
- DRM_DEBUG_KMS("Finished loading %s\n", dev_priv->csr.fw_path);
+ DRM_DEBUG_DRIVER("Finished loading %s (v%d.%d)\n",
+ dev_priv->csr.fw_path,
+ CSR_VERSION_MAJOR(csr->version),
+ CSR_VERSION_MINOR(csr->version));
+
out:
if (fw_loaded)
intel_runtime_pm_put(dev_priv);
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
