[Intel-gfx] [PATCH v2 05/24] drm/i915/display: Move vbt_firmware 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 | 3 +++
>  drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
>  drivers/gpu/drm/i915/display/intel_opregion.c       | 2 +-
>  drivers/gpu/drm/i915/i915_params.c                  | 3 ---
>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index eac82deede4c..72f1782e27fe 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -27,6 +27,9 @@ static struct intel_display_params intel_display_modparams __read_mostly = {
>   * debugfs mode to 0.
>   */
>  
> +intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
> +	"Load VBT from specified file under /lib/firmware");
> +
>  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 99b79bed9363..a6f37c55523d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -24,6 +24,7 @@ struct drm_i915_private;
>   *       debugfs file
>   */
>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
> +	param(char *, vbt_firmware, NULL, 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_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
> index 84078fb82b2f..1ce785db6a5e 100644
> --- a/drivers/gpu/drm/i915/display/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/display/intel_opregion.c
> @@ -841,7 +841,7 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)
>  {
>  	struct intel_opregion *opregion = &dev_priv->display.opregion;
>  	const struct firmware *fw = NULL;
> -	const char *name = dev_priv->params.vbt_firmware;
> +	const char *name = dev_priv->display.params.vbt_firmware;
>  	int ret;
>  
>  	if (!name || !*name)
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index c65e3314ae48..9d0535d774c9 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -87,9 +87,6 @@ i915_param_named_unsafe(vbt_sdvo_panel_type, int, 0400,
>  i915_param_named_unsafe(reset, uint, 0400,
>  	"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])");
>  
> -i915_param_named_unsafe(vbt_firmware, charp, 0400,
> -	"Load VBT from specified file under /lib/firmware");
> -
>  #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
>  i915_param_named(error_capture, bool, 0400,
>  	"Record the GPU state following a hang. "
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index 47a05c4a8e89..37a1d31a233c 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -46,7 +46,6 @@ struct drm_printer;
>   *       debugfs file
>   */
>  #define I915_PARAMS_FOR_EACH(param) \
> -	param(char *, vbt_firmware, NULL, 0400) \
>  	param(int, modeset, -1, 0400) \
>  	param(int, lvds_channel_mode, 0, 0400) \
>  	param(int, panel_use_ssc, -1, 0600) \

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

--
Cheers,
Luca.