On 2/4/20 9:05 AM, Michal Wajdeczko wrote:
On Tue, 04 Feb 2020 00:28:29 +0100, Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com> wrote:

The log struct is the only thing the function needs (apart from
the seq_file), so we can pass just that instead of the whole dev_priv.

v2: Split this change to its own patch (Michal)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>
Cc: Michal Wajdeczko <michal.wajdec...@intel.com>
Cc: John Harrison <john.c.harri...@intel.com>
Cc: Matthew Brost <matthew.br...@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index e75e8212f03b..7264c0ff766c 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1753,10 +1753,8 @@ stringify_guc_log_type(enum guc_log_buffer_type type)
     return "";
 }
-static void i915_guc_log_info(struct seq_file *m,
-                  struct drm_i915_private *dev_priv)
+static void i915_guc_log_info(struct seq_file *m, struct intel_guc_log *log)

maybe to avoid polluting i915_debugfs.c we should move this function to
gt/uc/intel_guc_log.c as universal printer:

void intel_guc_log_info(struct intel_guc_log *log, struct drm_printer *p)


ok

 {
-    struct intel_guc_log *log = &dev_priv->gt.uc.guc.log;
     enum guc_log_buffer_type type;
    if (!intel_guc_log_relay_created(log)) {
@@ -1784,7 +1782,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
     if (!USES_GUC(dev_priv))
         return -ENODEV;
-    i915_guc_log_info(m, dev_priv);
+    i915_guc_log_info(m, &dev_priv->gt.uc.guc.log);

too many dots ... this is "guc" info function, maybe we should have:

This is changed in the next patch to use intel_uc. It made more sense to me to keep that change in the patch that introduced a second use for the variable.

Daniele


     struct intel_guc *guc = &dev_priv->gt.uc.guc;
or
     struct intel_gt *gt = &dev_priv->gt;
     struct intel_uc *uc = &gt->uc;
     struct intel_guc *guc = &uc->guc;

as that "guc" is likely to be reused in "more" below

    /* Add more as required ... */
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to