drm/i915: Fix i915_inject_load_error() name to read *_probe_*

Commit 765e99d5e9ef ("drm/i915: Add i915 to i915_inject_probe_failure")
introduced new functions unfortunately named incompatibly with rules
established by commit e32e9fc04f45 ("drm/i915: Replace "_load" with
"_probe" consequently").  Fix it for consistency.

Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Michał Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Piotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191029102036.6326-2-janusz.krzysztofik@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index b7f8514e9b1dfd3111aaf1bca3e753244861a643..2498c55e0ea5d9a98bda2dd240540d3682f5585d 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1126,7 +1126,7 @@ int intel_guc_submission_enable(struct intel_guc *guc)
        enum intel_engine_id id;
        int err;
 
-       err = i915_inject_load_error(gt->i915, -ENXIO);
+       err = i915_inject_probe_error(gt->i915, -ENXIO);
        if (err)
                return err;
 

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 8be515c8d0f0634843c553ffd363647a0887a8c4..32a069841c14b34ceb1b9cbeffc51b1d1debb0e6 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -63,7 +63,7 @@ static int intel_huc_rsa_data_create(struct intel_huc *huc)
        void *vaddr;
        int err;
 
-       err = i915_inject_load_error(gt->i915, -ENXIO);
+       err = i915_inject_probe_error(gt->i915, -ENXIO);
        if (err)
                return err;
 
@@ -161,7 +161,7 @@ int intel_huc_auth(struct intel_huc *huc)
        if (!intel_uc_fw_is_loaded(&huc->fw))
                return -ENOEXEC;
 
-       ret = i915_inject_load_error(gt->i915, -ENXIO);
+       ret = i915_inject_probe_error(gt->i915, -ENXIO);
        if (ret)
                goto fail;
 

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 3fdbc935d155b8344e3b8df147383fa6aaa3b10e..629b19377a29e3bee70b8bcda2214de1ccd55098 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -20,7 +20,7 @@ static int __intel_uc_reset_hw(struct intel_uc *uc)
        int ret;
        u32 guc_status;
 
-       ret = i915_inject_load_error(gt->i915, -ENXIO);
+       ret = i915_inject_probe_error(gt->i915, -ENXIO);
        if (ret)
                return ret;
 
@@ -197,7 +197,7 @@ static int guc_enable_communication(struct intel_guc *guc)
 
        GEM_BUG_ON(guc_communication_enabled(guc));
 
-       ret = i915_inject_load_error(i915, -ENXIO);
+       ret = i915_inject_probe_error(i915, -ENXIO);
        if (ret)
                return ret;
 
@@ -372,7 +372,7 @@ static int uc_init_wopcm(struct intel_uc *uc)
        GEM_BUG_ON(!(size & GUC_WOPCM_SIZE_MASK));
        GEM_BUG_ON(size & ~GUC_WOPCM_SIZE_MASK);
 
-       err = i915_inject_load_error(gt->i915, -ENXIO);
+       err = i915_inject_probe_error(gt->i915, -ENXIO);
        if (err)
                return err;
 

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index bb4889d2346d897542b01c01df4ed46f739086c0..26beccff0908bcc1097e8f7f0b3f43edc1e24d58 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -220,29 +220,31 @@ static void __force_fw_fetch_failures(struct intel_uc_fw *uc_fw,
 {
        bool user = e == -EINVAL;
 
-       if (i915_inject_load_error(i915, e)) {
+       if (i915_inject_probe_error(i915, e)) {
                /* non-existing blob */
                uc_fw->path = "<invalid>";
                uc_fw->user_overridden = user;
-       } else if (i915_inject_load_error(i915, e)) {
+       } else if (i915_inject_probe_error(i915, e)) {
                /* require next major version */
                uc_fw->major_ver_wanted += 1;
                uc_fw->minor_ver_wanted = 0;
                uc_fw->user_overridden = user;
-       } else if (i915_inject_load_error(i915, e)) {
+       } else if (i915_inject_probe_error(i915, e)) {
                /* require next minor version */
                uc_fw->minor_ver_wanted += 1;
                uc_fw->user_overridden = user;
-       } else if (uc_fw->major_ver_wanted && i915_inject_load_error(i915, e)) {
+       } else if (uc_fw->major_ver_wanted &&
+                  i915_inject_probe_error(i915, e)) {
                /* require prev major version */
                uc_fw->major_ver_wanted -= 1;
                uc_fw->minor_ver_wanted = 0;
                uc_fw->user_overridden = user;
-       } else if (uc_fw->minor_ver_wanted && i915_inject_load_error(i915, e)) {
+       } else if (uc_fw->minor_ver_wanted &&
+                  i915_inject_probe_error(i915, e)) {
                /* require prev minor version - hey, this should work! */
                uc_fw->minor_ver_wanted -= 1;
                uc_fw->user_overridden = user;
-       } else if (user && i915_inject_load_error(i915, e)) {
+       } else if (user && i915_inject_probe_error(i915, e)) {
                /* officially unsupported platform */
                uc_fw->major_ver_wanted = 0;
                uc_fw->minor_ver_wanted = 0;
@@ -271,7 +273,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw, struct drm_i915_private *i915)
        GEM_BUG_ON(!i915->wopcm.size);
        GEM_BUG_ON(!intel_uc_fw_is_enabled(uc_fw));
 
-       err = i915_inject_load_error(i915, -ENXIO);
+       err = i915_inject_probe_error(i915, -ENXIO);
        if (err)
                return err;
 
@@ -432,7 +434,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, struct intel_gt *gt,
        u64 offset;
        int ret;
 
-       ret = i915_inject_load_error(gt->i915, -ETIMEDOUT);
+       ret = i915_inject_probe_error(gt->i915, -ETIMEDOUT);
        if (ret)
                return ret;
 
@@ -493,7 +495,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, struct intel_gt *gt,
        /* make sure the status was cleared the last time we reset the uc */
        GEM_BUG_ON(intel_uc_fw_is_loaded(uc_fw));
 
-       err = i915_inject_load_error(gt->i915, -ENOEXEC);
+       err = i915_inject_probe_error(gt->i915, -ENOEXEC);
        if (err)
                return err;
 

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0f271a53012db55ca7855ede8ba7d905102d7fc2..b1574ab104d7cbf62222c453b7d871adb2b1e74e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1300,11 +1300,11 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
        if (ret)
                goto err_gt;
 
-       ret = i915_inject_load_error(dev_priv, -ENODEV);
+       ret = i915_inject_probe_error(dev_priv, -ENODEV);
        if (ret)
                goto err_gt;
 
-       ret = i915_inject_load_error(dev_priv, -EIO);
+       ret = i915_inject_probe_error(dev_priv, -EIO);
        if (ret)
                goto err_gt;
 

diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index 02e969b64505594115ae3bf24b68f30fa1fba8c6..abe81ddde20ea2823e77430c25b12c3cc5d2fa37 100644 (file)
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 static unsigned int i915_probe_fail_count;
 
-int __i915_inject_load_error(struct drm_i915_private *i915, int err,
-                            const char *func, int line)
+int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
+                             const char *func, int line)
 {
        if (i915_probe_fail_count >= i915_modparams.inject_load_failure)
                return 0;

diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
index 00b55252ef514a84afcea6c65a3f0285fbe18464..04139ba1191ed2db8ecfac3fa3b36625b7021994 100644 (file)
--- a/drivers/gpu/drm/i915/i915_utils.h
+++ b/drivers/gpu/drm/i915/i915_utils.h
@@ -61,20 +61,20 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
-int __i915_inject_load_error(struct drm_i915_private *i915, int err,
-                            const char *func, int line);
-#define i915_inject_load_error(_i915, _err) \
-       __i915_inject_load_error((_i915), (_err), __func__, __LINE__)
+int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
+                             const char *func, int line);
+#define i915_inject_probe_error(_i915, _err) \
+       __i915_inject_probe_error((_i915), (_err), __func__, __LINE__)
 bool i915_error_injected(void);
 
 #else
 
-#define i915_inject_load_error(_i915, _err) 0
+#define i915_inject_probe_error(_i915, _err) 0
 #define i915_error_injected() false
 
 #endif
 
-#define i915_inject_probe_failure(i915) i915_inject_load_error((i915), -ENODEV)
+#define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
 #define i915_probe_error(i915, fmt, ...)                                  \
        __i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \