On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote: > Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display_params.c | 4 ++++ > drivers/gpu/drm/i915/display/intel_display_params.h | 1 + > drivers/gpu/drm/i915/display/intel_display_reset.c | 2 +- > drivers/gpu/drm/i915/i915_params.c | 4 ---- > drivers/gpu/drm/i915/i915_params.h | 2 +- > 5 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c > index 3c0e93934ac2..7f330a5e1188 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_params.c > +++ b/drivers/gpu/drm/i915/display/intel_display_params.c > @@ -80,6 +80,10 @@ intel_display_param_named_unsafe(load_detect_test, bool, 0400, > "Force-enable the VGA load detect code for testing (default:false). " > "For developers only."); > > +intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400, > + "Force a modeset during gpu reset for testing (default:false). " > + "For developers only."); > + > intel_display_param_named_unsafe(enable_fbc, int, 0400, > "Enable frame buffer compression for power savings " > "(default: -1 (use per-chip default))"); > diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h > index 8b36b73437b2..25f238e63ff8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_params.h > +++ b/drivers/gpu/drm/i915/display/intel_display_params.h > @@ -37,6 +37,7 @@ struct drm_i915_private; > param(int, edp_vswing, 0, 0400) \ > param(int, enable_dpcd_backlight, -1, 0600) \ > param(bool, load_detect_test, false, 0600) \ > + param(bool, force_reset_modeset_test, false, 0600) \ > param(int, enable_fbc, -1, 0600) \ > param(int, enable_psr, -1, 0600) \ > param(bool, psr_safest_params, false, 0400) \ > diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.c b/drivers/gpu/drm/i915/display/intel_display_reset.c > index 17178d5d7788..c2c347b22448 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_reset.c > +++ b/drivers/gpu/drm/i915/display/intel_display_reset.c > @@ -29,7 +29,7 @@ void intel_display_reset_prepare(struct drm_i915_private *dev_priv) > return; > > /* reset doesn't touch the display */ > - if (!dev_priv->params.force_reset_modeset_test && > + if (!dev_priv->display.params.force_reset_modeset_test && > !gpu_reset_clobbers_display(dev_priv)) > return; > > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c > index cb56973a2394..497e39b1dcfb 100644 > --- a/drivers/gpu/drm/i915/i915_params.c > +++ b/drivers/gpu/drm/i915/i915_params.c > @@ -86,10 +86,6 @@ i915_param_named_unsafe(force_probe, charp, 0400, > "Force probe options for specified supported devices. " > "See CONFIG_DRM_I915_FORCE_PROBE for details."); > > -i915_param_named_unsafe(force_reset_modeset_test, bool, 0400, > - "Force a modeset during gpu reset for testing (default:false). " > - "For developers only."); > - > i915_param_named(disable_display, bool, 0400, > "Disable display (default: false)"); > > diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h > index cf5448bbc087..5fa77ecb8d31 100644 > --- a/drivers/gpu/drm/i915/i915_params.h > +++ b/drivers/gpu/drm/i915/i915_params.h > @@ -63,7 +63,7 @@ struct drm_printer; > param(unsigned int, lmem_bar_size, 0, 0400) \ > /* leave bools at the end to not create holes */ \ > param(bool, enable_hangcheck, true, 0600) \ > - param(bool, force_reset_modeset_test, false, 0600) \ > + param(bool, force_reset_modeset_test, false, 0600) \ > param(bool, error_capture, true, IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) ? 0600 : 0) \ > param(bool, disable_display, false, 0400) \ > param(bool, verbose_state_checks, true, 0) \ Reviewed-by: Luca Coelho <luciano.coelho@xxxxxxxxx> -- Cheers, Luca.
