drm/i915/display: Move load_detect_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-18-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 913e5d230a4df9ae519cb626e2e515969d49cca3..0e33a0523a759bf788d3511540458a1731ccde57 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -841,7 +841,7 @@ intel_crt_detect(struct drm_connector *connector,
        if (!intel_display_device_enabled(dev_priv))
                return connector_status_disconnected;
 
-       if (dev_priv->params.load_detect_test) {
+       if (dev_priv->display.params.load_detect_test) {
                wakeref = intel_display_power_get(dev_priv,
                                                  intel_encoder->power_domain);
                goto load_detect;
@@ -901,7 +901,7 @@ load_detect:
                else if (DISPLAY_VER(dev_priv) < 4)
                        status = intel_crt_load_detect(crt,
                                to_intel_crtc(connector->state->crtc)->pipe);
-               else if (dev_priv->params.load_detect_test)
+               else if (dev_priv->display.params.load_detect_test)
                        status = connector_status_disconnected;
                else
                        status = connector_status_unknown;

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 190ca12ce64b63b10149ff229ec80cbc3aa1e580..16a30f7b96b47525a9afeed8d0966f0caec3284a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -76,6 +76,10 @@ intel_display_param_named(enable_dpcd_backlight, int, 0400,
        "Enable support for DPCD backlight control"
        "(-1=use per-VBT LFP backlight type setting [default], 0=disabled, 1=enable, 2=force VESA interface, 3=force Intel interface)");
 
+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(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 85d1128954e959b299a3bab5972f164beca294ad..558eecaa520ab2ae7d5a4d963770419794374622 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -36,6 +36,7 @@ struct drm_i915_private;
        param(int, invert_brightness, 0, 0600) \
        param(int, edp_vswing, 0, 0400) \
        param(int, enable_dpcd_backlight, -1, 0600) \
+       param(bool, load_detect_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/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index e15cd8491c7f0045888a4bae16bf66471f974b1d..cb56973a2394f910dbe5a7246c1483a00bc8fee7 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(load_detect_test, bool, 0400,
-       "Force-enable the VGA load detect code for testing (default:false). "
-       "For developers only.");
-
 i915_param_named_unsafe(force_reset_modeset_test, bool, 0400,
        "Force a modeset during gpu reset for testing (default:false). "
        "For developers only.");

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 8169234338b1f4bd8488a0856d60f4dbbb7474fe..cf5448bbc0876421388b2d2ca8ad906af5a8d275 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, load_detect_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) \