[Intel-gfx] [PATCH v2 07/24] drm/i915/display: Move panel_use_ssc module parameter under display

[Luca Coelho]

On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote:
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> ---
>  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_panel.c          | 4 ++--
>  drivers/gpu/drm/i915/i915_params.c                  | 4 ----
>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>  5 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index cdc42bc575b8..e25d70653c0f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -34,6 +34,10 @@ intel_display_param_named_unsafe(lvds_channel_mode, int, 0400,
>  	 "Specify LVDS channel mode "
>  	 "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");
>  
> +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(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 a4988ef44837..4b326baf146f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -26,6 +26,7 @@ struct drm_i915_private;
>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
>  	param(char *, vbt_firmware, NULL, 0400) \
>  	param(int, lvds_channel_mode, 0, 0400) \
> +	param(int, panel_use_ssc, -1, 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_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
> index 483beedac5b8..0d8e5320a4f8 100644
> --- a/drivers/gpu/drm/i915/display/intel_panel.c
> +++ b/drivers/gpu/drm/i915/display/intel_panel.c
> @@ -46,8 +46,8 @@
>  
>  bool intel_panel_use_ssc(struct drm_i915_private *i915)
>  {
> -	if (i915->params.panel_use_ssc >= 0)
> -		return i915->params.panel_use_ssc != 0;
> +	if (i915->display.params.panel_use_ssc >= 0)
> +		return i915->display.params.panel_use_ssc != 0;
>  	return i915->display.vbt.lvds_use_ssc &&
>  		!intel_has_quirk(i915, QUIRK_LVDS_SSC_DISABLE);
>  }
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index ea55cc2c4854..4123424b2c2e 100644
> --- 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(panel_use_ssc, int, 0400,
> -	"Use Spread Spectrum Clock with panels [LVDS/eDP] "
> -	"(default: auto from VBT)");
> -
>  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)");
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index 03ec2c2b589d..0bd365889e73 100644
> --- 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, panel_use_ssc, -1, 0600) \
>  	param(int, vbt_sdvo_panel_type, -1, 0400) \
>  	param(int, enable_dc, -1, 0400) \
>  	param(bool, enable_dpt, true, 0400) \

Reviewed-by: Luca Coelho <luciano.coelho at intel.com>

--
Cheers,
Luca.