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

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 4e8f1e91bb089944f3aded1bb174ee8c40e62ebe..70c0491aac42248d91184fd6aea4c0e8279e1fc0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1116,7 +1116,7 @@ parse_sdvo_panel_data(struct drm_i915_private *i915,
        struct drm_display_mode *panel_fixed_mode;
        int index;
 
-       index = i915->params.vbt_sdvo_panel_type;
+       index = i915->display.params.vbt_sdvo_panel_type;
        if (index == -2) {
                drm_dbg_kms(&i915->drm,
                            "Ignore SDVO panel mode from BIOS VBT tables.\n");

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 0813adfa56513e8e8957fd76160e94d0fbe5b281..d11c74ba001ea85345dda5bdc56babbfc9ca7b5e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -38,6 +38,10 @@ intel_display_param_named_unsafe(panel_use_ssc, int, 0400,
        "Use Spread Spectrum Clock with panels [LVDS/eDP] "
        "(default: auto from VBT)");
 
+intel_display_param_named_unsafe(vbt_sdvo_panel_type, int, 0400,
+       "Override/Ignore selection of SDVO panel mode in the VBT "
+       "(-2=ignore, -1=auto [default], index in VBT BIOS table)");
+
 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 ceed4af192c9d032ccfdc331a3866e17d8e920a5..03dea0ba81d122925faf588c58480f99f7ee3123 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -27,6 +27,7 @@ struct drm_i915_private;
        param(char *, vbt_firmware, NULL, 0400) \
        param(int, lvds_channel_mode, 0, 0400) \
        param(int, panel_use_ssc, -1, 0600) \
+       param(int, vbt_sdvo_panel_type, -1, 0400) \
        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 4123424b2c2e2ff27653babf185a4fb97bb11d05..d0abcbd526a76ef2f2c22cb457ca49aeda879521 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -72,10 +72,6 @@ i915_param_named_unsafe(enable_dc, int, 0400,
        "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; "
        "3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO)");
 
-i915_param_named_unsafe(vbt_sdvo_panel_type, int, 0400,
-       "Override/Ignore selection of SDVO panel mode in the VBT "
-       "(-2=ignore, -1=auto [default], index in VBT BIOS table)");
-
 i915_param_named_unsafe(reset, uint, 0400,
        "Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])");
 

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 0bd365889e73ea8ad32a74e2c6cfc34c4d6fbd37..1ea332dfbb5d1c5799afe4521a2b6e3779435bb8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,6 @@ struct drm_printer;
  */
 #define I915_PARAMS_FOR_EACH(param) \
        param(int, modeset, -1, 0400) \
-       param(int, vbt_sdvo_panel_type, -1, 0400) \
        param(int, enable_dc, -1, 0400) \
        param(bool, enable_dpt, true, 0400) \
        param(bool, enable_sagv, true, 0600) \