drm/i915: New structure to contain GuC logging related fields

So far there were 2 fields related to GuC logs in 'intel_guc' structure.
For the support of capturing GuC logs & storing them in a local buffer,
multiple new fields would have to be added. This warrants a separate
structure to contain the fields related to GuC logging state.
Added a new structure 'intel_guc_log' and instance of it inside
'intel_guc' structure.

v2: Rebase.

Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 4751b618ae12dcf4ad0a1b473715da4809ad1513..c5716397da20fb71236630caab1270d3e4293089 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2500,10 +2500,10 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
        struct drm_i915_gem_object *obj;
        int i = 0, pg;
 
-       if (!dev_priv->guc.log_vma)
+       if (!dev_priv->guc.log.vma)
                return 0;
 
-       obj = dev_priv->guc.log_vma->obj;
+       obj = dev_priv->guc.log.vma->obj;
        for (pg = 0; pg < obj->base.size / PAGE_SIZE; pg++) {
                u32 *log = kmap_atomic(i915_gem_object_get_page(obj, pg));
 

diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index a1bea7ead6969e3cb9754de7e435068f6c513e16..5e76b923ab4b93b9434032e216795475e9e7733f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -862,7 +862,7 @@ static void guc_log_create(struct intel_guc *guc)
                GUC_LOG_ISR_PAGES + 1 +
                GUC_LOG_CRASH_PAGES + 1) << PAGE_SHIFT;
 
-       vma = guc->log_vma;
+       vma = guc->log.vma;
        if (!vma) {
                vma = guc_allocate_vma(guc, size);
                if (IS_ERR(vma)) {
@@ -871,7 +871,7 @@ static void guc_log_create(struct intel_guc *guc)
                        return;
                }
 
-               guc->log_vma = vma;
+               guc->log.vma = vma;
        }
 
        /* each allocated unit is a page */
@@ -881,7 +881,7 @@ static void guc_log_create(struct intel_guc *guc)
                (GUC_LOG_CRASH_PAGES << GUC_LOG_CRASH_SHIFT);
 
        offset = i915_ggtt_offset(vma) >> PAGE_SHIFT; /* in pages */
-       guc->log_flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags;
+       guc->log.flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags;
 }
 
 static void guc_policies_init(struct guc_policies *policies)
@@ -1065,7 +1065,7 @@ void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
        struct intel_guc *guc = &dev_priv->guc;
 
        i915_vma_unpin_and_release(&guc->ads_vma);
-       i915_vma_unpin_and_release(&guc->log_vma);
+       i915_vma_unpin_and_release(&guc->log.vma);
 
        if (guc->ctx_pool_vma)
                ida_destroy(&guc->ctx_ids);

diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 5cdf7aa75be501722e4716488f92305c41e0a0a2..c73294164fed1952a1985356ca5730e6538441e9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -123,10 +123,14 @@ struct intel_guc_fw {
        uint32_t ucode_offset;
 };
 
+struct intel_guc_log {
+       uint32_t flags;
+       struct i915_vma *vma;
+};
+
 struct intel_guc {
        struct intel_guc_fw guc_fw;
-       uint32_t log_flags;
-       struct i915_vma *log_vma;
+       struct intel_guc_log log;
 
        struct i915_vma *ads_vma;
        struct i915_vma *ctx_pool_vma;

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 740be0b2a3609f24fa3eb7a8a73d62a4ad98a33d..a75abb8cc0cc1e1251e47f221ddc6dea7af5cef3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -211,7 +211,7 @@ static void guc_params_init(struct drm_i915_private *dev_priv)
        params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER |
                        GUC_CTL_VCS2_ENABLED;
 
-       params[GUC_CTL_LOG_PARAMS] = guc->log_flags;
+       params[GUC_CTL_LOG_PARAMS] = guc->log.flags;
 
        if (i915.guc_log_level >= 0) {
                params[GUC_CTL_DEBUG] =