[Intel-gfx] [PATCH v2 10/24] drm/i915/display: Move enable_dpt 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_dpt.c            | 6 ++++--
>  drivers/gpu/drm/i915/display/intel_fb.c             | 2 +-
>  drivers/gpu/drm/i915/display/skl_universal_plane.c  | 2 +-
>  drivers/gpu/drm/i915/i915_params.c                  | 3 ---
>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>  7 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index 7a528e72c970..8f222b5bfd8d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -47,6 +47,9 @@ intel_display_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)");
>  
> +intel_display_param_named_unsafe(enable_dpt, bool, 0400,
> +	"Enable display page table (DPT) (default: true)");
> +
>  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 8721179b3f09..c67ed16670c3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -29,6 +29,7 @@ struct drm_i915_private;
>  	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) \
>  	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_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
> index 48582b31b7f7..2b067cb952f0 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpt.c
> @@ -332,11 +332,13 @@ void intel_dpt_configure(struct intel_crtc *crtc)
>  
>  			intel_de_rmw(i915, PLANE_CHICKEN(pipe, plane_id),
>  				     PLANE_CHICKEN_DISABLE_DPT,
> -				     i915->params.enable_dpt ? 0 : PLANE_CHICKEN_DISABLE_DPT);
> +				     i915->display.params.enable_dpt ? 0 :
> +				     PLANE_CHICKEN_DISABLE_DPT);
>  		}
>  	} else if (DISPLAY_VER(i915) == 13) {
>  		intel_de_rmw(i915, CHICKEN_MISC_2,
>  			     CHICKEN_MISC_DISABLE_DPT,
> -			     i915->params.enable_dpt ? 0 : CHICKEN_MISC_DISABLE_DPT);
> +			     i915->display.params.enable_dpt ? 0 :
> +			     CHICKEN_MISC_DISABLE_DPT);
>  	}
>  }
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 19b35ece31f1..9a48eb7dcf8b 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -764,7 +764,7 @@ bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)
>  
>  bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)
>  {
> -	return fb && to_i915(fb->dev)->params.enable_dpt &&
> +	return fb && to_i915(fb->dev)->display.params.enable_dpt &&
>  		intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);
>  }
>  
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 245a64332cc7..6fb5612bff2b 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2489,7 +2489,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>  		goto error;
>  	}
>  
> -	if (!dev_priv->params.enable_dpt &&
> +	if (!dev_priv->display.params.enable_dpt &&
>  	    intel_fb_modifier_uses_dpt(dev_priv, fb->modifier)) {
>  		drm_dbg_kms(&dev_priv->drm, "DPT disabled, skipping initial FB\n");
>  		goto error;
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index 3d370e43df3c..773a0a709fc6 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -95,9 +95,6 @@ i915_param_named_unsafe(disable_power_well, int, 0400,
>  
>  i915_param_named_unsafe(enable_ips, int, 0400, "Enable IPS (default: true)");
>  
> -i915_param_named_unsafe(enable_dpt, bool, 0400,
> -	"Enable display page table (DPT) (default: true)");
> -
>  i915_param_named_unsafe(load_detect_test, bool, 0400,
>  	"Force-enable the VGA load detect code for testing (default:false). "
>  	"For developers only.");
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index c3487b9d6937..b8728990cb8b 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(bool, enable_dpt, true, 0400) \
>  	param(bool, enable_sagv, true, 0600) \
>  	param(int, disable_power_well, -1, 0400) \
>  	param(int, enable_ips, 1, 0600) \

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

--
Cheers,
Luca.