On Thu, 07 Mar 2024, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Use enc_to_intel_dsi() instead hand rolling it. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 3 +-- > drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > index ac456a2275db..79ecfc339430 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -1616,8 +1616,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, > struct drm_connector_state *conn_state) > { > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > - struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, > - base); > + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > struct intel_connector *intel_connector = intel_dsi->attached_connector; > struct drm_display_mode *adjusted_mode = > &pipe_config->hw.adjusted_mode; > diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c > index 9b33b8a74d64..63f4af601d15 100644 > --- a/drivers/gpu/drm/i915/display/vlv_dsi.c > +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c > @@ -273,8 +273,7 @@ static int intel_dsi_compute_config(struct intel_encoder *encoder, > struct drm_connector_state *conn_state) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, > - base); > + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > struct intel_connector *intel_connector = intel_dsi->attached_connector; > struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; > int ret; -- Jani Nikula, Intel