drm/i915/display: Move enable_dc 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-10-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 d11c74ba001ea85345dda5bdc56babbfc9ca7b5e..60fa0bbce77d34ac343da74a6624f58e258d18ef 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -42,6 +42,11 @@ 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_dc, int, 0400,
+       "Enable power-saving display C-states. "
+       "(-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)");
+
 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 03dea0ba81d122925faf588c58480f99f7ee3123..2cca06ad7d71b1883fcfd71ee741015f5a8691a2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -28,6 +28,7 @@ struct drm_i915_private;
        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_dc, -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/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index e25785ae1c20cef1784b02f78b6fde92c9118c14..4832eb8da080ed77d7cbaabd7aa48f1d52aecb43 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -1020,7 +1020,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
                sanitize_disable_power_well_option(dev_priv,
                                                   dev_priv->params.disable_power_well);
        power_domains->allowed_dc_mask =
-               get_allowed_dc_mask(dev_priv, dev_priv->params.enable_dc);
+               get_allowed_dc_mask(dev_priv, dev_priv->display.params.enable_dc);
 
        power_domains->target_dc_state =
                sanitize_target_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6);

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index d0abcbd526a76ef2f2c22cb457ca49aeda879521..3d370e43df3cdf9a71bb09294486baa89d56b749 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -67,11 +67,6 @@ i915_param_named(modeset, int, 0400,
        "Use kernel modesetting [KMS] (0=disable, "
        "1=on, -1=force vga console preference [default])");
 
-i915_param_named_unsafe(enable_dc, int, 0400,
-       "Enable power-saving display C-states. "
-       "(-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(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 1ea332dfbb5d1c5799afe4521a2b6e3779435bb8..c3487b9d69378095d8d924c63e534cba1a84aba5 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, enable_dc, -1, 0400) \
        param(bool, enable_dpt, true, 0400) \
        param(bool, enable_sagv, true, 0600) \
        param(int, disable_power_well, -1, 0400) \