Message ID | c14340984c4313d85531f2f31746d79f365a935a.1731011435.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | drm/i915/mst: cleanups, renames, clarifications | expand |
On Thu, Nov 07, 2024 at 10:32:14PM +0200, Jani Nikula wrote: > Pass the primary encoder to the primary encoder hooks. This is > pedantically correct, but intel_ddi_post_pll_disable() also works with > the fake encoder by coincidence. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 13449c85162d..9670a48586ea 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -1113,7 +1113,7 @@ static void intel_mst_post_pll_disable_dp(struct intel_atomic_state *state, > > if (intel_dp->active_mst_links == 0 && > dig_port->base.post_pll_disable) > - dig_port->base.post_pll_disable(state, encoder, old_crtc_state, old_conn_state); > + dig_port->base.post_pll_disable(state, &dig_port->base, old_crtc_state, old_conn_state); Yes, this worked only due to enc_to_dig_port() etc., but at the least this should match the way all the other hooks for primary are called (which pass the primary encoder): Reviewed-by: Imre Deak <imre.deak@intel.com> > } > > static void intel_mst_pre_pll_enable_dp(struct intel_atomic_state *state, > -- > 2.39.5 >
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 13449c85162d..9670a48586ea 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1113,7 +1113,7 @@ static void intel_mst_post_pll_disable_dp(struct intel_atomic_state *state, if (intel_dp->active_mst_links == 0 && dig_port->base.post_pll_disable) - dig_port->base.post_pll_disable(state, encoder, old_crtc_state, old_conn_state); + dig_port->base.post_pll_disable(state, &dig_port->base, old_crtc_state, old_conn_state); } static void intel_mst_pre_pll_enable_dp(struct intel_atomic_state *state,
Pass the primary encoder to the primary encoder hooks. This is pedantically correct, but intel_ddi_post_pll_disable() also works with the fake encoder by coincidence. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)