On Tue, Dec 08, 2015 at 07:59:36PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> We're supposed to pass the primary DP encoder to intel_ddi_clk_select(),
> not the fake MST encoder. Do so.
>
> There's no real bug here though, since intel_ddi_clk_select() only
> checks if the encoder type is EDP (which it isn't for either the
> primary DP encoder or the fake MST encoder), and it gets the DDI port
> via intel_ddi_get_encoder_port() (which knows how to do the
> fake->primary->port dance itself).
>
> Fixes: e404ba8 ("drm/i915: Setup DDI clk for MST on SKL")
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Meh, just stumbled over found->encoder = encoder in this very function.
Ugh, another thing to fix up ...
Anyway, looks correct. Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 8c4e7dfe304c..abfc171888b8 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -173,7 +173,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
> intel_mst->port = found->port;
>
> if (intel_dp->active_mst_links == 0) {
> - intel_ddi_clk_select(encoder, intel_crtc->config);
> + intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);
>
> intel_dp_set_link_params(intel_dp, intel_crtc->config);
>
> --
> 2.4.10
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
