Re: [Intel-gfx] [PATCH 1/9] drm/i915: Pass intel_connector to intel_panel_{init, fini}()
On Wed, 23 Mar 2022, Ville Syrjala wrote: > From: Ville Syrjälä > > All the other intel_panel functions take struct intel_connector, > so might as well make init()/fini() take one as well. > > Signed-off-by: Ville Syrjälä Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_connector.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp.c| 2 +- > drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- > drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- > drivers/gpu/drm/i915/display/intel_panel.c | 11 ++- > drivers/gpu/drm/i915/display/intel_panel.h | 5 ++--- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > 9 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c > b/drivers/gpu/drm/i915/display/icl_dsi.c > index 00cae5d26637..c7a6c2cce297 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -2057,7 +2057,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) > goto err; > } > > - intel_panel_init(_connector->panel, fixed_mode, NULL); > + intel_panel_init(intel_connector, fixed_mode, NULL); > intel_backlight_setup(intel_connector, INVALID_PIPE); > > if (dev_priv->vbt.dsi.config->dual_link) > diff --git a/drivers/gpu/drm/i915/display/intel_connector.c > b/drivers/gpu/drm/i915/display/intel_connector.c > index a5f5dd55b0cb..1dcc268927a2 100644 > --- a/drivers/gpu/drm/i915/display/intel_connector.c > +++ b/drivers/gpu/drm/i915/display/intel_connector.c > @@ -102,7 +102,7 @@ void intel_connector_destroy(struct drm_connector > *connector) > if (!IS_ERR_OR_NULL(intel_connector->edid)) > kfree(intel_connector->edid); > > - intel_panel_fini(_connector->panel); > + intel_panel_fini(intel_connector); > > drm_connector_cleanup(connector); > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 9e19165fd175..3bf44f7909e5 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5060,7 +5060,7 @@ static bool intel_edp_init_connector(struct intel_dp > *intel_dp, > pipe_name(pipe)); > } > > - intel_panel_init(_connector->panel, fixed_mode, downclock_mode); > + intel_panel_init(intel_connector, fixed_mode, downclock_mode); > if (!(dev_priv->quirks & QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK)) > intel_connector->panel.backlight.power = > intel_pps_backlight_power; > intel_backlight_setup(intel_connector, pipe); > diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c > b/drivers/gpu/drm/i915/display/intel_dvo.c > index d4670889d26c..d4dc16a9c0dd 100644 > --- a/drivers/gpu/drm/i915/display/intel_dvo.c > +++ b/drivers/gpu/drm/i915/display/intel_dvo.c > @@ -549,7 +549,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) >* headers, likely), so for now, just get the current >* mode being output through DVO. >*/ > - intel_panel_init(_connector->panel, > + intel_panel_init(intel_connector, > > intel_dvo_get_current_mode(intel_encoder), >NULL); > intel_dvo->panel_wants_dither = true; > diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c > b/drivers/gpu/drm/i915/display/intel_lvds.c > index 5449d69fbae5..cd685dbf324b 100644 > --- a/drivers/gpu/drm/i915/display/intel_lvds.c > +++ b/drivers/gpu/drm/i915/display/intel_lvds.c > @@ -996,7 +996,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > out: > mutex_unlock(>mode_config.mutex); > > - intel_panel_init(_connector->panel, fixed_mode, downclock_mode); > + intel_panel_init(intel_connector, fixed_mode, downclock_mode); > intel_backlight_setup(intel_connector, INVALID_PIPE); > > lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder, > fixed_mode); > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c > b/drivers/gpu/drm/i915/display/intel_panel.c > index f428d0457c17..8c9e26539cc5 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -599,10 +599,12 @@ intel_panel_mode_valid(struct intel_connector > *connector, > return MODE_OK; > } > > -int intel_panel_init(struct intel_panel *panel, > +int intel_panel_init(struct intel_connector *connector, >struct drm_display_mode *fixed_mode, >struct drm_display_mode *downclock_mode) > { > + struct intel_panel *panel = >panel; > + > intel_backlight_init_funcs(panel); > > if (fixed_mode) > @@ -613,16 +615,15
[Intel-gfx] [PATCH 1/9] drm/i915: Pass intel_connector to intel_panel_{init, fini}()
From: Ville Syrjälä All the other intel_panel functions take struct intel_connector, so might as well make init()/fini() take one as well. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_connector.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c| 2 +- drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_panel.c | 11 ++- drivers/gpu/drm/i915/display/intel_panel.h | 5 ++--- drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index 00cae5d26637..c7a6c2cce297 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -2057,7 +2057,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) goto err; } - intel_panel_init(_connector->panel, fixed_mode, NULL); + intel_panel_init(intel_connector, fixed_mode, NULL); intel_backlight_setup(intel_connector, INVALID_PIPE); if (dev_priv->vbt.dsi.config->dual_link) diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c index a5f5dd55b0cb..1dcc268927a2 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -102,7 +102,7 @@ void intel_connector_destroy(struct drm_connector *connector) if (!IS_ERR_OR_NULL(intel_connector->edid)) kfree(intel_connector->edid); - intel_panel_fini(_connector->panel); + intel_panel_fini(intel_connector); drm_connector_cleanup(connector); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 9e19165fd175..3bf44f7909e5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5060,7 +5060,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } - intel_panel_init(_connector->panel, fixed_mode, downclock_mode); + intel_panel_init(intel_connector, fixed_mode, downclock_mode); if (!(dev_priv->quirks & QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK)) intel_connector->panel.backlight.power = intel_pps_backlight_power; intel_backlight_setup(intel_connector, pipe); diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c index d4670889d26c..d4dc16a9c0dd 100644 --- a/drivers/gpu/drm/i915/display/intel_dvo.c +++ b/drivers/gpu/drm/i915/display/intel_dvo.c @@ -549,7 +549,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) * headers, likely), so for now, just get the current * mode being output through DVO. */ - intel_panel_init(_connector->panel, + intel_panel_init(intel_connector, intel_dvo_get_current_mode(intel_encoder), NULL); intel_dvo->panel_wants_dither = true; diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c index 5449d69fbae5..cd685dbf324b 100644 --- a/drivers/gpu/drm/i915/display/intel_lvds.c +++ b/drivers/gpu/drm/i915/display/intel_lvds.c @@ -996,7 +996,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out: mutex_unlock(>mode_config.mutex); - intel_panel_init(_connector->panel, fixed_mode, downclock_mode); + intel_panel_init(intel_connector, fixed_mode, downclock_mode); intel_backlight_setup(intel_connector, INVALID_PIPE); lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder, fixed_mode); diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c index f428d0457c17..8c9e26539cc5 100644 --- a/drivers/gpu/drm/i915/display/intel_panel.c +++ b/drivers/gpu/drm/i915/display/intel_panel.c @@ -599,10 +599,12 @@ intel_panel_mode_valid(struct intel_connector *connector, return MODE_OK; } -int intel_panel_init(struct intel_panel *panel, +int intel_panel_init(struct intel_connector *connector, struct drm_display_mode *fixed_mode, struct drm_display_mode *downclock_mode) { + struct intel_panel *panel = >panel; + intel_backlight_init_funcs(panel); if (fixed_mode) @@ -613,16 +615,15 @@ int intel_panel_init(struct intel_panel *panel, return 0; } -void intel_panel_fini(struct intel_panel *panel) +void intel_panel_fini(struct intel_connector *connector) { - struct intel_connector