On Thu, 31 Mar 2022, Ville Syrjala <ville.syrj...@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> intel_drrs_init() is a mostly pointless wrapper around
> intel_panel_add_edid_downclock_mode(), get rid of it.
>
> The only really useful thing left in there is the debug
> print regarding the DRRS type supported by the connector.
> Let's just move that into intel_panel_init().
>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nik...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/display/intel_drrs.c | 24 ----------------------
> drivers/gpu/drm/i915/display/intel_drrs.h | 1 -
> drivers/gpu/drm/i915/display/intel_panel.c | 6 ++++++
> 4 files changed, 7 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index 67472555211d..e539bc315d7b 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5075,7 +5075,7 @@ static bool intel_edp_init_connector(struct intel_dp
> *intel_dp,
> intel_panel_add_edid_fixed_mode(intel_connector);
> if (intel_panel_preferred_fixed_mode(intel_connector) &&
> intel_edp_has_drrs(intel_dp))
> - intel_drrs_init(intel_connector);
> + intel_panel_add_edid_downclock_mode(intel_connector);
>
> /* MSO requires information from the EDID */
> intel_edp_mso_init(intel_dp);
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c
> b/drivers/gpu/drm/i915/display/intel_drrs.c
> index 8fd280c7c83f..3ebea697f77a 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.c
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.c
> @@ -354,27 +354,3 @@ void intel_crtc_drrs_init(struct intel_crtc *crtc)
> mutex_init(&crtc->drrs.mutex);
> crtc->drrs.cpu_transcoder = INVALID_TRANSCODER;
> }
> -
> -/**
> - * intel_drrs_init - Init DRRS for eDP connector
> - * @connector: eDP connector
> - *
> - * This function is called only once at driver load to initialize
> - * DRRS support for the connector.
> - *
> - * Returns:
> - * Downclock mode if panel supports it, else return NULL.
> - * DRRS support is determined by the presence of downclock mode (apart
> - * from VBT setting).
> - */
> -void intel_drrs_init(struct intel_connector *connector)
> -{
> - struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> -
> - intel_panel_add_edid_downclock_mode(connector);
> -
> - drm_dbg_kms(&dev_priv->drm,
> - "[CONNECTOR:%d:%s] DRRS type: %s\n",
> - connector->base.base.id, connector->base.name,
> - intel_drrs_type_str(dev_priv->vbt.drrs_type));
> -}
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.h
> b/drivers/gpu/drm/i915/display/intel_drrs.h
> index 3ea52220cd69..084c3f4f8403 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.h
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.h
> @@ -27,6 +27,5 @@ void intel_drrs_compute_config(struct intel_connector
> *connector,
> struct intel_crtc_state *pipe_config,
> int output_bpp, bool constant_n);
> void intel_crtc_drrs_init(struct intel_crtc *crtc);
> -void intel_drrs_init(struct intel_connector *connector);
>
> #endif /* __INTEL_DRRS_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_panel.c
> b/drivers/gpu/drm/i915/display/intel_panel.c
> index 1e56ca9033e0..5ecc6fc80588 100644
> --- a/drivers/gpu/drm/i915/display/intel_panel.c
> +++ b/drivers/gpu/drm/i915/display/intel_panel.c
> @@ -35,6 +35,7 @@
> #include "intel_connector.h"
> #include "intel_de.h"
> #include "intel_display_types.h"
> +#include "intel_drrs.h"
> #include "intel_panel.h"
>
> bool intel_panel_use_ssc(struct drm_i915_private *i915)
> @@ -634,6 +635,11 @@ int intel_panel_init(struct intel_connector *connector)
>
> intel_backlight_init_funcs(panel);
>
> + drm_dbg_kms(connector->base.dev,
> + "[CONNECTOR:%d:%s] DRRS type: %s\n",
> + connector->base.base.id, connector->base.name,
> + intel_drrs_type_str(intel_panel_drrs_type(connector)));
> +
> return 0;
> }
--
Jani Nikula, Intel Open Source Graphics Center
