[Intel-gfx] [PATCH 03/18] drm/i915: New structure to contain GuC logging related fields

[akash . goel]

From: Akash Goel 

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 
Reviewed-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/i915_debugfs.c| 4 ++--
 drivers/gpu/drm/i915/i915_guc_submission.c | 8 
 drivers/gpu/drm/i915/intel_guc.h   | 8 ++--
 drivers/gpu/drm/i915/intel_guc_loader.c| 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 358663e..0fb9938 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2492,10 +2492,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 2ce98aaf..ef38a32 100644
--- 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)
@@ -1063,7 +1063,7 @@ void i915_guc_submission_fini(struct drm_i915_private 
*dev_priv)
struct intel_guc *guc = _priv->guc;
 
i915_vma_unpin_and_release(>ads_vma);
-   i915_vma_unpin_and_release(>log_vma);
+   i915_vma_unpin_and_release(>log.vma);
 
if (guc->ctx_pool_vma)
ida_destroy(>ctx_ids);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 5cdf7aa..c732941 100644
--- 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 c37829f..410d98a 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -209,7 +209,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] =
-- 
1.9.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 03/18] drm/i915: New structure to contain GuC logging related fields

[akash . goel]

From: Akash Goel 

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 
Reviewed-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/i915_debugfs.c| 4 ++--
 drivers/gpu/drm/i915/i915_guc_submission.c | 8 
 drivers/gpu/drm/i915/intel_guc.h   | 8 ++--
 drivers/gpu/drm/i915/intel_guc_loader.c| 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 02b627e..c93d423 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2517,10 +2517,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 c681680..c234a96 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -841,7 +841,7 @@ static void guc_create_log(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)) {
@@ -850,7 +850,7 @@ static void guc_create_log(struct intel_guc *guc)
return;
}
 
-   guc->log_vma = vma;
+   guc->log.vma = vma;
}
 
/* each allocated unit is a page */
@@ -860,7 +860,7 @@ static void guc_create_log(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 init_guc_policies(struct guc_policies *policies)
@@ -1032,7 +1032,7 @@ void i915_guc_submission_fini(struct drm_i915_private 
*dev_priv)
struct intel_guc *guc = _priv->guc;
 
i915_vma_unpin_and_release(>ads_vma);
-   i915_vma_unpin_and_release(>log_vma);
+   i915_vma_unpin_and_release(>log.vma);
 
if (guc->ctx_pool_vma)
ida_destroy(>ctx_ids);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index c973262..d32023c 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -121,10 +121,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 f747fe0..17f3ff1 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -189,7 +189,7 @@ static void set_guc_init_params(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] =
-- 
1.9.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 03/18] drm/i915: New structure to contain GuC logging related fields

[akash . goel]

From: Akash Goel 

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 
Reviewed-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/i915_debugfs.c| 4 ++--
 drivers/gpu/drm/i915/i915_guc_submission.c | 8 
 drivers/gpu/drm/i915/intel_guc.h   | 8 ++--
 drivers/gpu/drm/i915/intel_guc_loader.c| 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index b89478a..b2cfcf4 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2578,10 +2578,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 fec5898..34fb893 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -843,7 +843,7 @@ static void guc_create_log(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)) {
@@ -852,7 +852,7 @@ static void guc_create_log(struct intel_guc *guc)
return;
}
 
-   guc->log_vma = vma;
+   guc->log.vma = vma;
}
 
/* each allocated unit is a page */
@@ -862,7 +862,7 @@ static void guc_create_log(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 init_guc_policies(struct guc_policies *policies)
@@ -1034,7 +1034,7 @@ void i915_guc_submission_fini(struct drm_i915_private 
*dev_priv)
struct intel_guc *guc = _priv->guc;
 
i915_vma_unpin_and_release(>ads_vma);
-   i915_vma_unpin_and_release(>log_vma);
+   i915_vma_unpin_and_release(>log.vma);
 
if (guc->ctx_pool_vma)
ida_destroy(>ctx_ids);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index c973262..d32023c 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -121,10 +121,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 b3751c4..6fd24d9 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -187,7 +187,7 @@ static void set_guc_init_params(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] =
-- 
1.9.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx