On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote:
> Signed-off-by: Jouni Högander <jouni.hogan...@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_dp_aux_backlight.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 a16adfa36b64..01b732819aab 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -72,6 +72,10 @@ intel_display_param_named_unsafe(edp_vswing, int, 0400,
> "(0=use value from vbt [default], 1=low power swing(200mV),"
> "2=default swing(400mV))");
>
> +intel_display_param_named(enable_dpcd_backlight, int, 0400,
> + "Enable support for DPCD backlight control"
> + "(-1=use per-VBT LFP backlight type setting [default], 0=disabled,
> 1=enable, 2=force VESA interface, 3=force Intel interface)");
> +
> 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 9e749ea97707..6c08ed07bb58 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -35,6 +35,7 @@ struct drm_i915_private;
> param(int, enable_ips, 1, 0600) \
> param(int, invert_brightness, 0, 0600) \
> param(int, edp_vswing, 0, 0400) \
> + param(int, enable_dpcd_backlight, -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_dp_aux_backlight.c
> b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> index 95cc5251843e..1c2912ce59a5 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> @@ -146,7 +146,7 @@ intel_dp_aux_supports_hdr_backlight(struct
> intel_connector *connector)
> * HDR static metadata we need to start maintaining table of
> * ranges for such panels.
> */
> - if (i915->params.enable_dpcd_backlight !=
> INTEL_DP_AUX_BACKLIGHT_FORCE_INTEL &&
> + if (i915->display.params.enable_dpcd_backlight !=
> INTEL_DP_AUX_BACKLIGHT_FORCE_INTEL &&
> !(connector->base.hdr_sink_metadata.hdmi_type1.metadata_type &
> BIT(HDMI_STATIC_METADATA_TYPE1))) {
> drm_info(&i915->drm,
> @@ -489,7 +489,7 @@ int intel_dp_aux_init_backlight_funcs(struct
> intel_connector *connector)
> /* Check the VBT and user's module parameters to figure out which
> * interfaces to probe
> */
> - switch (i915->params.enable_dpcd_backlight) {
> + switch (i915->display.params.enable_dpcd_backlight) {
> case INTEL_DP_AUX_BACKLIGHT_OFF:
> return -ENODEV;
> case INTEL_DP_AUX_BACKLIGHT_AUTO:
> diff --git a/drivers/gpu/drm/i915/i915_params.c
> b/drivers/gpu/drm/i915/i915_params.c
> index 6b9df9f9d842..e15cd8491c7f 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -140,10 +140,6 @@ i915_param_named_unsafe(inject_probe_failure, uint, 0400,
> "Force an error after a number of failure check points (0:disabled
> (default), N:force failure at the Nth failure check point)");
> #endif
>
> -i915_param_named(enable_dpcd_backlight, int, 0400,
> - "Enable support for DPCD backlight control"
> - "(-1=use per-VBT LFP backlight type setting [default], 0=disabled,
> 1=enable, 2=force VESA interface, 3=force Intel interface)");
> -
> #if IS_ENABLED(CONFIG_DRM_I915_GVT)
> i915_param_named(enable_gvt, bool, 0400,
> "Enable support for Intel GVT-g graphics virtualization host
> support(default:false)");
> diff --git a/drivers/gpu/drm/i915/i915_params.h
> b/drivers/gpu/drm/i915/i915_params.h
> index c33edaee5032..8169234338b1 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -57,7 +57,6 @@ struct drm_printer;
> param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
> param(unsigned int, reset, 3, 0600) \
> param(unsigned int, inject_probe_failure, 0, 0) \
> - param(int, enable_dpcd_backlight, -1, 0600) \
> param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
> param(unsigned int, request_timeout_ms,
> CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \
> param(unsigned int, lmem_size, 0, 0400) \
Reviewed-by: Luca Coelho <luciano.coe...@intel.com>
--
Cheers,
Luca.
