mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
drm/i915: Fix i915_inject_load_error() name to read *_probe_*
Commit50d84418f5
("drm/i915: Add i915 to i915_inject_probe_failure") introduced new functions unfortunately named incompatibly with rules established by commitf2db53f14d
("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
This commit is contained in:
parent
7f9d4c0884
commit
dd6e38dfc1
7 changed files with 27 additions and 25 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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, \
|
||||
|
|
Loading…
Reference in a new issue