On Tue, Dec 10, 2019 at 02:16:23AM +0000, Souza, Jose wrote:
> On Mon, 2019-12-09 at 21:43 +0200, Ville Syrjälä wrote:
> > On Mon, Dec 09, 2019 at 06:45:43PM +0000, Souza, Jose wrote:
> > > On Mon, 2019-12-09 at 18:40 +0200, Ville Syrjälä wrote:
> > > > On Fri, Dec 06, 2019 at 05:18:29PM -0800, José Roberto de Souza
> > > > wrote:
> > > > > On TGL the blending of all the streams have moved from DDI to
> > > > > transcoder, so now every transcoder working over the same MST
> > > > > port
> > > > > must
> > > > > send its stream to a master transcoder and master will send to
> > > > > DDI
> > > > > respecting the time slots.
> > > > >
> > > > > So here adding all the CRTCs that shares the same MST stream if
> > > > > needed and computing their state again, it will pick the first
> > > > > transcoder among the ones in the same stream to be master.
> > > > >
> > > > > Most of the time skl_commit_modeset_enables() enables pipes in
> > > > > a
> > > > > crescent order but due DDB overlapping it might not happen,
> > > > > this
> > > > > scenario will be handled in the next patch.
> > > > >
> > > > > BSpec: 50493
> > > > > BSpec: 49190
> > > > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > > > Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> > > > > Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
> > > > > ---
> > > > > drivers/gpu/drm/i915/display/intel_ddi.c | 14 +-
> > > > > drivers/gpu/drm/i915/display/intel_display.c | 15 +-
> > > > > .../drm/i915/display/intel_display_types.h | 3 +
> > > > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 163
> > > > > ++++++++++++++++++
> > > > > drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 +
> > > > > 5 files changed, 196 insertions(+), 4 deletions(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> > > > > b/drivers/gpu/drm/i915/display/intel_ddi.c
> > > > > index 3cacb1e279c1..be5bc506d4d3 100644
> > > > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> > > > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> > > > > @@ -1903,8 +1903,13 @@
> > > > > intel_ddi_transcoder_func_reg_val_get(const
> > > > > struct intel_crtc_state *crtc_state)
> > > > > temp |= TRANS_DDI_MODE_SELECT_DP_MST;
> > > > > temp |= DDI_PORT_WIDTH(crtc_state->lane_count);
> > > > >
> > > > > - if (INTEL_GEN(dev_priv) >= 12)
> > > > > - temp |=
> > > > > TRANS_DDI_MST_TRANSPORT_SELECT(crtc_state->cpu_transcoder);
> > > > > + if (INTEL_GEN(dev_priv) >= 12) {
> > > > > + enum transcoder master;
> > > > > +
> > > > > + master = crtc_state-
> > > > > >mst_master_transcoder;
> > > > > + WARN_ON(master == INVALID_TRANSCODER);
> > > >
> > > > I'd drop the WARN_ON(). If we keep adding these for every little
> > > > thing
> > > > we'll drown in them.
> > > >
> > > > > + temp |=
> > > > > TRANS_DDI_MST_TRANSPORT_SELECT(master);
> > > > > + }
> > > > > } else {
> > > > > temp |= TRANS_DDI_MODE_SELECT_DP_SST;
> > > > > temp |= DDI_PORT_WIDTH(crtc_state->lane_count);
> > > > > @@ -4372,6 +4377,11 @@ void intel_ddi_get_config(struct
> > > > > intel_encoder *encoder,
> > > > > pipe_config->output_types |=
> > > > > BIT(INTEL_OUTPUT_DP_MST);
> > > > > pipe_config->lane_count =
> > > > > ((temp & DDI_PORT_WIDTH_MASK) >>
> > > > > DDI_PORT_WIDTH_SHIFT) + 1;
> > > > > +
> > > > > + if (INTEL_GEN(dev_priv) >= 12)
> > > > > + pipe_config->mst_master_transcoder =
> > > > > + REG_FIELD_GET(TRANS_DDI
> > > > > _MST_TRA
> > > > > NSPORT_SELECT_MASK, temp);
> > > > > +
> > > > > intel_dp_get_m_n(intel_crtc, pipe_config);
> > > > > break;
> > > > > default:
> > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > > > > b/drivers/gpu/drm/i915/display/intel_display.c
> > > > > index 821ba8053f9d..f89494c849ce 100644
> > > > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > > > @@ -46,6 +46,7 @@
> > > > > #include "display/intel_crt.h"
> > > > > #include "display/intel_ddi.h"
> > > > > #include "display/intel_dp.h"
> > > > > +#include "display/intel_dp_mst.h"
> > > > > #include "display/intel_dsi.h"
> > > > > #include "display/intel_dvo.h"
> > > > > #include "display/intel_gmbus.h"
> > > > > @@ -12542,6 +12543,11 @@ static void
> > > > > intel_dump_pipe_config(const
> > > > > struct intel_crtc_state *pipe_config,
> > > > > pipe_config->csc_mode,
> > > > > pipe_config-
> > > > > > gamma_mode,
> > > > > pipe_config->gamma_enable,
> > > > > pipe_config-
> > > > > > csc_enable);
> > > > >
> > > > > + if (INTEL_GEN(dev_priv) >= 12 &&
> > > > > + intel_crtc_has_type(pipe_config,
> > > > > INTEL_OUTPUT_DP_MST))
> > > >
> > > > Could probably print this unconditionally to keep the code less
> > > > messy.
> > >
> > > I'm not setting mst_master_transcoder = INVALID_TRANSCODER in the
> > > other
> > > code paths, so it would print transcoder A for HDMI, DP SST and to
> > > DP
> > > MST in gen < 12.
> > > That is fine? Should I add mst_master_transcoder =
> > > INVALID_TRANSCODER
> > > to all those code paths? For me the best option is keep this
> > > checks.
> >
> > I think setting to invalid would be nice.
> >
> > With https://patchwork.freedesktop.org/series/69129/
> > we could even do it in a nice central place just the once.
>
> Awesome, just rvb it.
> It still apply without conflicts and compile, moving this MST patches
> on top.
Thanks. Oh, now I remember. That series didn't pass BAT. The fix for
that is the remainder of https://patchwork.freedesktop.org/series/69366/
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
