drm/i915/display: Move force_reset_modeset_test parameter under display

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-19-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 16a30f7b96b47525a9afeed8d0966f0caec3284a..a6f0dd9beb928cfbf70a7ea07e53a29a4d4fe60e 100644 (file)
--- 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 558eecaa520ab2ae7d5a4d963770419794374622..5f76dbd4b099bba10bef8488d0559679cdfd5236 100644 (file)
--- 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 17178d5d7788a97fd0be7d215c0358e81bb4daa0..c2c347b22448acdd3558448b44aa5b782c0169d1 100644 (file)
--- 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 cb56973a2394f910dbe5a7246c1483a00bc8fee7..497e39b1dcfb9d3693d798562ffd635aff149829 100644 (file)
--- 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 cf5448bbc0876421388b2d2ca8ad906af5a8d275..9f3188b674e0080d69e500030491775bad8df1cc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -63,7 +63,6 @@ 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, 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) \