Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/mst: Set intel_dp_set_m_n() for MST slaves
On Tue, 11 Feb 2020, José Roberto de Souza wrote: > Commit 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for > DDI platforms") moved the intel_dp_set_m_n() from hsw_crtc_enable() > to intel_ddi_pre_enable_dp() but it missed add it to > intel_mst_pre_enable_dp() causing MST slaves to not work. > > v2: Not setting intel_ddi_set_dp_msa() twice for MST master > > Fixes: 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for DDI > platforms") > Cc: Vandita Kulkarni > Cc: Jani Nikula > Signed-off-by: José Roberto de Souza Pushed patch 1 to dinq, thanks for the fix. BR, Jani. > --- > drivers/gpu/drm/i915/display/intel_ddi.c| 5 +++-- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 ++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 544e15603ef9..a1fd8fd67c85 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3615,10 +3615,11 @@ static void intel_ddi_pre_enable_dp(struct > intel_encoder *encoder, > /* MST will call a setting of MSA after an allocating of Virtual Channel >* from MST encoder pre_enable callback. >*/ > - if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) > + if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) { > intel_ddi_set_dp_msa(crtc_state, conn_state); > > - intel_dp_set_m_n(crtc_state, M1_N1); > + intel_dp_set_m_n(crtc_state, M1_N1); > + } > } > > static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 9cd59141953d..d7bfa7c350e9 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -480,6 +480,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder > *encoder, > intel_ddi_enable_pipe_clock(pipe_config); > > intel_ddi_set_dp_msa(pipe_config, conn_state); > + > + intel_dp_set_m_n(pipe_config, M1_N1); > } > > static void intel_mst_enable_dp(struct intel_encoder *encoder, -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/mst: Set intel_dp_set_m_n() for MST slaves
On Tue, 11 Feb 2020, José Roberto de Souza wrote: > Commit 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for > DDI platforms") moved the intel_dp_set_m_n() from hsw_crtc_enable() > to intel_ddi_pre_enable_dp() but it missed add it to > intel_mst_pre_enable_dp() causing MST slaves to not work. > > v2: Not setting intel_ddi_set_dp_msa() twice for MST master > > Fixes: 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for DDI > platforms") > Cc: Vandita Kulkarni > Cc: Jani Nikula > Signed-off-by: José Roberto de Souza Thanks, Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_ddi.c| 5 +++-- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 ++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 544e15603ef9..a1fd8fd67c85 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3615,10 +3615,11 @@ static void intel_ddi_pre_enable_dp(struct > intel_encoder *encoder, > /* MST will call a setting of MSA after an allocating of Virtual Channel >* from MST encoder pre_enable callback. >*/ > - if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) > + if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) { > intel_ddi_set_dp_msa(crtc_state, conn_state); > > - intel_dp_set_m_n(crtc_state, M1_N1); > + intel_dp_set_m_n(crtc_state, M1_N1); > + } > } > > static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 9cd59141953d..d7bfa7c350e9 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -480,6 +480,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder > *encoder, > intel_ddi_enable_pipe_clock(pipe_config); > > intel_ddi_set_dp_msa(pipe_config, conn_state); > + > + intel_dp_set_m_n(pipe_config, M1_N1); > } > > static void intel_mst_enable_dp(struct intel_encoder *encoder, -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH v2 1/2] drm/i915/mst: Set intel_dp_set_m_n() for MST slaves
Commit 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for DDI platforms") moved the intel_dp_set_m_n() from hsw_crtc_enable() to intel_ddi_pre_enable_dp() but it missed add it to intel_mst_pre_enable_dp() causing MST slaves to not work. v2: Not setting intel_ddi_set_dp_msa() twice for MST master Fixes: 1c9d2eb24153 ("drm/i915: move intel_dp_set_m_n() to encoder for DDI platforms") Cc: Vandita Kulkarni Cc: Jani Nikula Signed-off-by: José Roberto de Souza --- drivers/gpu/drm/i915/display/intel_ddi.c| 5 +++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 544e15603ef9..a1fd8fd67c85 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3615,10 +3615,11 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, /* MST will call a setting of MSA after an allocating of Virtual Channel * from MST encoder pre_enable callback. */ - if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) + if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) { intel_ddi_set_dp_msa(crtc_state, conn_state); - intel_dp_set_m_n(crtc_state, M1_N1); + intel_dp_set_m_n(crtc_state, M1_N1); + } } static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 9cd59141953d..d7bfa7c350e9 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -480,6 +480,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, intel_ddi_enable_pipe_clock(pipe_config); intel_ddi_set_dp_msa(pipe_config, conn_state); + + intel_dp_set_m_n(pipe_config, M1_N1); } static void intel_mst_enable_dp(struct intel_encoder *encoder, -- 2.25.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx