guc: Kill USES_GUC macro

Michal Wajdeczko Tue, 04 Feb 2020 09:19:29 -0800

On Tue, 04 Feb 2020 00:28:30 +0100, Daniele Ceraolo Spurio<daniele.ceraolospu...@intel.com> wrote:

use intel_uc_uses_guc() directly instead, to be consistent in the way we
check what we want to do with the GuC.


v2: split guc_log_info changes to their 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>


Reviewed-by: Michal Wajdeczko <michal.wajdec...@intel.com>

some diff could be smaller after updating 1/10

---
 drivers/gpu/drm/i915/gt/intel_ggtt.c |  2 +-
 drivers/gpu/drm/i915/i915_debugfs.c  | 15 +++++++++------
 drivers/gpu/drm/i915/i915_drv.h      |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.cb/drivers/gpu/drm/i915/gt/intel_ggtt.c

index 7dae91e0d002..048240b19772 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c

@@ -427,7 +427,7 @@ static int ggtt_reserve_guc_top(struct i915_ggtt*ggtt)

        u64 size;
        int ret;
-       if (!USES_GUC(ggtt->vm.i915))
+       if (!intel_uc_uses_guc(&ggtt->vm.gt->uc))
                return 0;
        GEM_BUG_ON(ggtt->vm.total <= GUC_GGTT_TOP);

diff --git a/drivers/gpu/drm/i915/i915_debugfs.cb/drivers/gpu/drm/i915/i915_debugfs.c

index 7264c0ff766c..bfdcb657780b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c

@@ -1778,11 +1778,12 @@ static void i915_guc_log_info(struct seq_file*m, struct intel_guc_log *log)

 static int i915_guc_info(struct seq_file *m, void *data)
 {
        struct drm_i915_private *dev_priv = node_to_i915(m->private);
+       struct intel_uc *uc = &dev_priv->gt.uc;
-       if (!USES_GUC(dev_priv))
+       if (!intel_uc_uses_guc(uc))
                return -ENODEV;
-       i915_guc_log_info(m, &dev_priv->gt.uc.guc.log);
+       i915_guc_log_info(m, &uc->guc.log);
        /* Add more as required ... */

@@ -1883,11 +1884,12 @@ static int i915_guc_log_dump(struct seq_file *m,void *data)

 static int i915_guc_log_level_get(void *data, u64 *val)
 {
        struct drm_i915_private *dev_priv = data;
+       struct intel_uc *uc = &dev_priv->gt.uc;
-       if (!USES_GUC(dev_priv))
+       if (!intel_uc_uses_guc(uc))
                return -ENODEV;
-       *val = intel_guc_log_get_level(&dev_priv->gt.uc.guc.log);
+       *val = intel_guc_log_get_level(&uc->guc.log);
        return 0;
 }

@@ -1895,11 +1897,12 @@ static int i915_guc_log_level_get(void *data,u64 *val)

 static int i915_guc_log_level_set(void *data, u64 val)
 {
        struct drm_i915_private *dev_priv = data;
+       struct intel_uc *uc = &dev_priv->gt.uc;
-       if (!USES_GUC(dev_priv))
+       if (!intel_uc_uses_guc(uc))
                return -ENODEV;
-       return intel_guc_log_set_level(&dev_priv->gt.uc.guc.log, val);
+       return intel_guc_log_set_level(&uc->guc.log, val);
 }
DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_level_fops,

diff --git a/drivers/gpu/drm/i915/i915_drv.hb/drivers/gpu/drm/i915/i915_drv.h

index a71ff233cc55..a8e1ec7d571f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1701,7 +1701,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define HAS_GT_UC(dev_priv)    (INTEL_INFO(dev_priv)->has_gt_uc)
/* Having GuC is not the same as using GuC */
-#define USES_GUC(dev_priv)             intel_uc_uses_guc(&(dev_priv)->gt.uc)

#defineUSES_GUC_SUBMISSION(dev_priv) intel_uc_uses_guc_submission(&(dev_priv)->gt.uc)

#define HAS_POOLED_EU(dev_priv) (INTEL_INFO(dev_priv)->has_pooled_eu)

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

Re: [Intel-gfx] [PATCH v2 02/10] drm/i915/guc: Kill USES_GUC macro

Reply via email to