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: Rename "inject_load_failure" module parameter
Commit f2db53f14d
("drm/i915: Replace "_load" with "_probe"
consequently") deliberately left the name of the module parameter
unchanged as that would require a corresponding change on IGT size.
Now as the IGT side change has been submitted, complete the switch to
the "probe" nomenclature.
Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.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-3-janusz.krzysztofik@linux.intel.com
This commit is contained in:
parent
dd6e38dfc1
commit
4ec37538a6
3 changed files with 7 additions and 7 deletions
|
@ -166,7 +166,7 @@ i915_param_named_unsafe(enable_dp_mst, bool, 0600,
|
|||
"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");
|
||||
|
||||
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
|
||||
i915_param_named_unsafe(inject_load_failure, uint, 0400,
|
||||
i915_param_named_unsafe(inject_probe_failure, uint, 0400,
|
||||
"Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)");
|
||||
#endif
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ struct drm_printer;
|
|||
param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO)) \
|
||||
param(int, edp_vswing, 0) \
|
||||
param(int, reset, 3) \
|
||||
param(unsigned int, inject_load_failure, 0) \
|
||||
param(unsigned int, inject_probe_failure, 0) \
|
||||
param(int, fastboot, -1) \
|
||||
param(int, enable_dpcd_backlight, 0) \
|
||||
param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE) \
|
||||
|
|
|
@ -57,22 +57,22 @@ static unsigned int i915_probe_fail_count;
|
|||
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)
|
||||
if (i915_probe_fail_count >= i915_modparams.inject_probe_failure)
|
||||
return 0;
|
||||
|
||||
if (++i915_probe_fail_count < i915_modparams.inject_load_failure)
|
||||
if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
|
||||
return 0;
|
||||
|
||||
__i915_printk(i915, KERN_INFO,
|
||||
"Injecting failure %d at checkpoint %u [%s:%d]\n",
|
||||
err, i915_modparams.inject_load_failure, func, line);
|
||||
i915_modparams.inject_load_failure = 0;
|
||||
err, i915_modparams.inject_probe_failure, func, line);
|
||||
i915_modparams.inject_probe_failure = 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
bool i915_error_injected(void)
|
||||
{
|
||||
return i915_probe_fail_count && !i915_modparams.inject_load_failure;
|
||||
return i915_probe_fail_count && !i915_modparams.inject_probe_failure;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue