[Intel-gfx] [PATCH v2 15/24] drm/i915/display: Move edp_vswing 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_bios.c           | 4 ++--
>  drivers/gpu/drm/i915/display/intel_display_params.c | 6 ++++++
>  drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
>  drivers/gpu/drm/i915/i915_params.c                  | 6 ------
>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>  5 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 70c0491aac42..69db1a3a1499 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1514,9 +1514,9 @@ parse_edp(struct drm_i915_private *i915,
>  		u8 vswing;
>  
>  		/* Don't read from VBT if module parameter has valid value*/
> -		if (i915->params.edp_vswing) {
> +		if (i915->display.params.edp_vswing) {
>  			panel->vbt.edp.low_vswing =
> -				i915->params.edp_vswing == 1;
> +				i915->display.params.edp_vswing == 1;
>  		} else {
>  			vswing = (edp->edp_vswing_preemph >> (panel_type * 4)) & 0xF;
>  			panel->vbt.edp.low_vswing = vswing == 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index 8d8050a22bf7..a16adfa36b64 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -66,6 +66,12 @@ intel_display_param_named_unsafe(invert_brightness, int, 0400,
>  	"to dri-devel at lists.freedesktop.org, if your machine needs it. "
>  	"It will then be included in an upcoming module version.");
>  
> +/* WA to get away with the default setting in VBT for early platforms.Will be removed */
> +intel_display_param_named_unsafe(edp_vswing, int, 0400,
> +	"Ignore/Override vswing pre-emph table selection from VBT "
> +	"(0=use value from vbt [default], 1=low power swing(200mV),"
> +	"2=default swing(400mV))");
> +
>  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 23fa03ea38c9..9e749ea97707 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -34,6 +34,7 @@ struct drm_i915_private;
>  	param(int, disable_power_well, -1, 0400) \
>  	param(int, enable_ips, 1, 0600) \
>  	param(int, invert_brightness, 0, 0600) \
> +	param(int, edp_vswing, 0, 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 423fe54484e1..6b9df9f9d842 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -111,12 +111,6 @@ i915_param_named(verbose_state_checks, bool, 0600,
>  i915_param_named_unsafe(nuclear_pageflip, bool, 0400,
>  	"Force enable atomic functionality on platforms that don't have full support yet.");
>  
> -/* WA to get away with the default setting in VBT for early platforms.Will be removed */
> -i915_param_named_unsafe(edp_vswing, int, 0400,
> -	"Ignore/Override vswing pre-emph table selection from VBT "
> -	"(0=use value from vbt [default], 1=low power swing(200mV),"
> -	"2=default swing(400mV))");
> -
>  i915_param_named_unsafe(enable_guc, int, 0400,
>  	"Enable GuC load for GuC submission and/or HuC load. "
>  	"Required functionality can be selected using bitmask values. "
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index ae0873443a65..c33edaee5032 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -55,7 +55,6 @@ struct drm_printer;
>  	param(char *, gsc_firmware_path, NULL, 0400) \
>  	param(bool, memtest, false, 0400) \
>  	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
> -	param(int, edp_vswing, 0, 0400) \
>  	param(unsigned int, reset, 3, 0600) \
>  	param(unsigned int, inject_probe_failure, 0, 0) \
>  	param(int, enable_dpcd_backlight, -1, 0600) \

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

--
Cheers,
Luca.