Some functions already use i915 name instead of dev_priv.
Let's rename this param in all remaining functions, except
those that still use legacy macros.

Signed-off-by: Michal Wajdeczko <michal.wajdec...@intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 122 ++++++++++++++++++++--------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 0bc8f3b..c22155b 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -50,10 +50,10 @@ static int __intel_uc_reset_hw(struct drm_i915_private 
*dev_priv)
        return ret;
 }
 
-static int __get_platform_enable_guc(struct drm_i915_private *dev_priv)
+static int __get_platform_enable_guc(struct drm_i915_private *i915)
 {
-       struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
-       struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
+       struct intel_uc_fw *guc_fw = &i915->guc.fw;
+       struct intel_uc_fw *huc_fw = &i915->huc.fw;
        int enable_guc = 0;
 
        /* Default is to enable GuC/HuC if we know their firmwares */
@@ -67,12 +67,12 @@ static int __get_platform_enable_guc(struct 
drm_i915_private *dev_priv)
        return enable_guc;
 }
 
-static int __get_default_guc_log_level(struct drm_i915_private *dev_priv)
+static int __get_default_guc_log_level(struct drm_i915_private *i915)
 {
        int guc_log_level = 0; /* disabled */
 
        /* Enable if we're running on platform with GuC and debug config */
-       if (HAS_GUC(dev_priv) && intel_uc_is_using_guc() &&
+       if (HAS_GUC(i915) && intel_uc_is_using_guc() &&
            (IS_ENABLED(CONFIG_DRM_I915_DEBUG) ||
             IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)))
                guc_log_level = 1 + GUC_LOG_VERBOSITY_MAX;
@@ -99,14 +99,14 @@ static int __get_default_guc_log_level(struct 
drm_i915_private *dev_priv)
  * unless GuC is enabled on given platform and the driver is compiled with
  * debug config when this modparam will default to "enable(1..4)".
  */
-static void sanitize_options_early(struct drm_i915_private *dev_priv)
+static void sanitize_options_early(struct drm_i915_private *i915)
 {
-       struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
-       struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
+       struct intel_uc_fw *guc_fw = &i915->guc.fw;
+       struct intel_uc_fw *huc_fw = &i915->huc.fw;
 
        /* A negative value means "use platform default" */
        if (i915_modparams.enable_guc < 0)
-               i915_modparams.enable_guc = __get_platform_enable_guc(dev_priv);
+               i915_modparams.enable_guc = __get_platform_enable_guc(i915);
 
        DRM_DEBUG_DRIVER("enable_guc=%d (submission:%s huc:%s)\n",
                         i915_modparams.enable_guc,
@@ -117,28 +117,28 @@ static void sanitize_options_early(struct 
drm_i915_private *dev_priv)
        if (intel_uc_is_using_guc() && !intel_uc_fw_is_selected(guc_fw)) {
                DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
                         "enable_guc", i915_modparams.enable_guc,
-                        !HAS_GUC(dev_priv) ? "no GuC hardware" :
-                                             "no GuC firmware");
+                        !HAS_GUC(i915) ? "no GuC hardware" :
+                                         "no GuC firmware");
        }
 
        /* Verify HuC firmware availability */
        if (intel_uc_is_using_huc() && !intel_uc_fw_is_selected(huc_fw)) {
                DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
                         "enable_guc", i915_modparams.enable_guc,
-                        !HAS_HUC(dev_priv) ? "no HuC hardware" :
-                                             "no HuC firmware");
+                        !HAS_HUC(i915) ? "no HuC hardware" :
+                                         "no HuC firmware");
        }
 
        /* A negative value means "use platform/config default" */
        if (i915_modparams.guc_log_level < 0)
                i915_modparams.guc_log_level =
-                       __get_default_guc_log_level(dev_priv);
+                       __get_default_guc_log_level(i915);
 
        if (i915_modparams.guc_log_level > 0 && !intel_uc_is_using_guc()) {
                DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
                         "guc_log_level", i915_modparams.guc_log_level,
-                        !HAS_GUC(dev_priv) ? "no GuC hardware" :
-                                             "GuC not enabled");
+                        !HAS_GUC(i915) ? "no GuC hardware" :
+                                         "GuC not enabled");
                i915_modparams.guc_log_level = 0;
        }
 
@@ -159,36 +159,36 @@ static void sanitize_options_early(struct 
drm_i915_private *dev_priv)
        GEM_BUG_ON(i915_modparams.guc_log_level < 0);
 }
 
-void intel_uc_init_early(struct drm_i915_private *dev_priv)
+void intel_uc_init_early(struct drm_i915_private *i915)
 {
-       intel_guc_init_early(&dev_priv->guc);
-       intel_huc_init_early(&dev_priv->huc);
+       intel_guc_init_early(&i915->guc);
+       intel_huc_init_early(&i915->huc);
 
-       sanitize_options_early(dev_priv);
+       sanitize_options_early(i915);
 }
 
-void intel_uc_init_fw(struct drm_i915_private *dev_priv)
+void intel_uc_init_fw(struct drm_i915_private *i915)
 {
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return;
 
-       if (USES_HUC(dev_priv))
-               intel_uc_fw_fetch(dev_priv, &dev_priv->huc.fw);
+       if (USES_HUC(i915))
+               intel_uc_fw_fetch(i915, &i915->huc.fw);
 
-       intel_uc_fw_fetch(dev_priv, &dev_priv->guc.fw);
+       intel_uc_fw_fetch(i915, &i915->guc.fw);
 }
 
-void intel_uc_fini_fw(struct drm_i915_private *dev_priv)
+void intel_uc_fini_fw(struct drm_i915_private *i915)
 {
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return;
 
-       intel_uc_fw_fini(&dev_priv->guc.fw);
+       intel_uc_fw_fini(&i915->guc.fw);
 
-       if (USES_HUC(dev_priv))
-               intel_uc_fw_fini(&dev_priv->huc.fw);
+       if (USES_HUC(i915))
+               intel_uc_fw_fini(&i915->huc.fw);
 
-       guc_free_load_err_log(&dev_priv->guc);
+       guc_free_load_err_log(&i915->guc);
 }
 
 /**
@@ -199,9 +199,9 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv)
  * Setup minimal state necessary for MMIO accesses later in the
  * initialization sequence.
  */
-void intel_uc_init_mmio(struct drm_i915_private *dev_priv)
+void intel_uc_init_mmio(struct drm_i915_private *i915)
 {
-       intel_guc_init_send_regs(&dev_priv->guc);
+       intel_guc_init_send_regs(&i915->guc);
 }
 
 static void guc_capture_load_err_log(struct intel_guc *guc)
@@ -245,9 +245,9 @@ void intel_uc_unregister(struct drm_i915_private *i915)
 
 static int guc_enable_communication(struct intel_guc *guc)
 {
-       struct drm_i915_private *dev_priv = guc_to_i915(guc);
+       struct drm_i915_private *i915 = guc_to_i915(guc);
 
-       if (HAS_GUC_CT(dev_priv))
+       if (HAS_GUC_CT(i915))
                return intel_guc_enable_ct(guc);
 
        guc->send = intel_guc_send_mmio;
@@ -256,20 +256,20 @@ static int guc_enable_communication(struct intel_guc *guc)
 
 static void guc_disable_communication(struct intel_guc *guc)
 {
-       struct drm_i915_private *dev_priv = guc_to_i915(guc);
+       struct drm_i915_private *i915 = guc_to_i915(guc);
 
-       if (HAS_GUC_CT(dev_priv))
+       if (HAS_GUC_CT(i915))
                intel_guc_disable_ct(guc);
 
        guc->send = intel_guc_send_nop;
 }
 
-int intel_uc_init_misc(struct drm_i915_private *dev_priv)
+int intel_uc_init_misc(struct drm_i915_private *i915)
 {
-       struct intel_guc *guc = &dev_priv->guc;
+       struct intel_guc *guc = &i915->guc;
        int ret;
 
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return 0;
 
        ret = intel_guc_init_wq(guc);
@@ -279,32 +279,32 @@ int intel_uc_init_misc(struct drm_i915_private *dev_priv)
        return 0;
 }
 
-void intel_uc_fini_misc(struct drm_i915_private *dev_priv)
+void intel_uc_fini_misc(struct drm_i915_private *i915)
 {
-       struct intel_guc *guc = &dev_priv->guc;
+       struct intel_guc *guc = &i915->guc;
 
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return;
 
        intel_guc_fini_wq(guc);
 }
 
-int intel_uc_init(struct drm_i915_private *dev_priv)
+int intel_uc_init(struct drm_i915_private *i915)
 {
-       struct intel_guc *guc = &dev_priv->guc;
+       struct intel_guc *guc = &i915->guc;
        int ret;
 
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return 0;
 
-       if (!HAS_GUC(dev_priv))
+       if (!HAS_GUC(i915))
                return -ENODEV;
 
        ret = intel_guc_init(guc);
        if (ret)
                return ret;
 
-       if (USES_GUC_SUBMISSION(dev_priv)) {
+       if (USES_GUC_SUBMISSION(i915)) {
                /*
                 * This is stuff we need to have available at fw load time
                 * if we are planning to enable submission later
@@ -319,16 +319,16 @@ int intel_uc_init(struct drm_i915_private *dev_priv)
        return 0;
 }
 
-void intel_uc_fini(struct drm_i915_private *dev_priv)
+void intel_uc_fini(struct drm_i915_private *i915)
 {
-       struct intel_guc *guc = &dev_priv->guc;
+       struct intel_guc *guc = &i915->guc;
 
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return;
 
-       GEM_BUG_ON(!HAS_GUC(dev_priv));
+       GEM_BUG_ON(!HAS_GUC(i915));
 
-       if (USES_GUC_SUBMISSION(dev_priv))
+       if (USES_GUC_SUBMISSION(i915))
                intel_guc_submission_fini(guc);
 
        intel_guc_fini(guc);
@@ -458,28 +458,28 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
        return -EIO;
 }
 
-void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
+void intel_uc_fini_hw(struct drm_i915_private *i915)
 {
-       struct intel_huc *huc = &dev_priv->huc;
-       struct intel_guc *guc = &dev_priv->guc;
+       struct intel_huc *huc = &i915->huc;
+       struct intel_guc *guc = &i915->guc;
 
-       if (!USES_GUC(dev_priv))
+       if (!USES_GUC(i915))
                return;
 
-       GEM_BUG_ON(!HAS_GUC(dev_priv));
+       GEM_BUG_ON(!HAS_GUC(i915));
 
        if (!intel_guc_is_loaded(guc))
                return;
 
-       if (USES_GUC_SUBMISSION(dev_priv))
+       if (USES_GUC_SUBMISSION(i915))
                intel_guc_submission_disable(guc);
 
        guc_disable_communication(guc);
        intel_huc_sanitize(huc);
        intel_guc_sanitize(guc);
 
-       if (USES_GUC_SUBMISSION(dev_priv))
-               gen9_disable_guc_interrupts(dev_priv);
+       if (USES_GUC_SUBMISSION(i915))
+               gen9_disable_guc_interrupts(i915);
 }
 
 int intel_uc_suspend(struct drm_i915_private *i915)
-- 
1.9.1

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

Reply via email to