From: Lucas De Marchi <lucas.demarchi@intel.com> To: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [PATCH] drm/i915: Split a setting of MSA to MST and SST Date: Thu, 7 Nov 2019 15:22:33 -0800 [thread overview] Message-ID: <20191107232233.spekqqkutv4b2s5w@ldmartin-desk1> (raw) In-Reply-To: <20191106212636.502471-1-gwan-gyeong.mun@intel.com> On Wed, Nov 06, 2019 at 11:26:36PM +0200, Gwan-gyeong Mun wrote: >The setting of MSA is done by the DDI .pre_enable() hook. And when we are >using MST, the MSA is only set to first mst stream by calling of >DDI .pre_eanble() hook. It raies issues to non-first mst streams. >Wrong MSA or missed MSA packets might show scrambled screen or wrong >screen. > >This splits a setting of MSA to MST and SST cases. And In the MST case it >will call a setting of MSA after an allocating of Virtual Channel from >MST encoder pre_enable callback. > >Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> >Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112212 >Fixes: 0c06fa156006 ("drm/i915/dp: Add support of BT.2020 Colorimetry to DP MSA") >Fixes: d4a415dcda35 ("drm/i915: Fix MST oops due to MSA changes") >Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> >--- > drivers/gpu/drm/i915/display/intel_ddi.c | 10 ++++++---- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +++ > 2 files changed, 9 insertions(+), 4 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >index c91521bcf06a..ef41fa0f77f0 100644 >--- a/drivers/gpu/drm/i915/display/intel_ddi.c >+++ b/drivers/gpu/drm/i915/display/intel_ddi.c >@@ -1794,10 +1794,8 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state, > * of Color Encoding Format and Content Color Gamut] while sending > * YCBCR 420, HDR BT.2020 signals we should program MSA MISC1 fields > * which indicate VSC SDP for the Pixel Encoding/Colorimetry Format. >- * >- * FIXME MST doesn't pass in the conn_state > */ >- if (conn_state && intel_dp_needs_vsc_sdp(crtc_state, conn_state)) >+ if (intel_dp_needs_vsc_sdp(crtc_state, conn_state)) > temp |= DP_MSA_MISC_COLOR_VSC_SDP; > > I915_WRITE(TRANS_MSA_MISC(cpu_transcoder), temp); >@@ -3606,7 +3604,11 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, > else > hsw_ddi_pre_enable_dp(encoder, crtc_state, conn_state); > >- intel_ddi_set_dp_msa(crtc_state, conn_state); >+ /* 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)) >+ intel_ddi_set_dp_msa(crtc_state, conn_state); > } > > 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 5e267c5b4c20..cb77f8072820 100644 >--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c >+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c >@@ -345,6 +345,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, > */ > if (INTEL_GEN(dev_priv) < 12 || !first_mst_stream) > intel_ddi_enable_pipe_clock(pipe_config); >+ >+ intel_ddi_set_dp_msa(pipe_config, conn_state); >+ extra new line here, otherwise Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi > } > > static void intel_mst_enable_dp(struct intel_encoder *encoder, >-- >2.23.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Split a setting of MSA to MST and SST Date: Thu, 7 Nov 2019 15:22:33 -0800 [thread overview] Message-ID: <20191107232233.spekqqkutv4b2s5w@ldmartin-desk1> (raw) Message-ID: <20191107232233.SKV4ACuYM6fSCrUgd5TT_ozdZuOyokGGtEsUL0ob7dU@z> (raw) In-Reply-To: <20191106212636.502471-1-gwan-gyeong.mun@intel.com> On Wed, Nov 06, 2019 at 11:26:36PM +0200, Gwan-gyeong Mun wrote: >The setting of MSA is done by the DDI .pre_enable() hook. And when we are >using MST, the MSA is only set to first mst stream by calling of >DDI .pre_eanble() hook. It raies issues to non-first mst streams. >Wrong MSA or missed MSA packets might show scrambled screen or wrong >screen. > >This splits a setting of MSA to MST and SST cases. And In the MST case it >will call a setting of MSA after an allocating of Virtual Channel from >MST encoder pre_enable callback. > >Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> >Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112212 >Fixes: 0c06fa156006 ("drm/i915/dp: Add support of BT.2020 Colorimetry to DP MSA") >Fixes: d4a415dcda35 ("drm/i915: Fix MST oops due to MSA changes") >Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> >--- > drivers/gpu/drm/i915/display/intel_ddi.c | 10 ++++++---- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +++ > 2 files changed, 9 insertions(+), 4 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >index c91521bcf06a..ef41fa0f77f0 100644 >--- a/drivers/gpu/drm/i915/display/intel_ddi.c >+++ b/drivers/gpu/drm/i915/display/intel_ddi.c >@@ -1794,10 +1794,8 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state, > * of Color Encoding Format and Content Color Gamut] while sending > * YCBCR 420, HDR BT.2020 signals we should program MSA MISC1 fields > * which indicate VSC SDP for the Pixel Encoding/Colorimetry Format. >- * >- * FIXME MST doesn't pass in the conn_state > */ >- if (conn_state && intel_dp_needs_vsc_sdp(crtc_state, conn_state)) >+ if (intel_dp_needs_vsc_sdp(crtc_state, conn_state)) > temp |= DP_MSA_MISC_COLOR_VSC_SDP; > > I915_WRITE(TRANS_MSA_MISC(cpu_transcoder), temp); >@@ -3606,7 +3604,11 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, > else > hsw_ddi_pre_enable_dp(encoder, crtc_state, conn_state); > >- intel_ddi_set_dp_msa(crtc_state, conn_state); >+ /* 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)) >+ intel_ddi_set_dp_msa(crtc_state, conn_state); > } > > 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 5e267c5b4c20..cb77f8072820 100644 >--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c >+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c >@@ -345,6 +345,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, > */ > if (INTEL_GEN(dev_priv) < 12 || !first_mst_stream) > intel_ddi_enable_pipe_clock(pipe_config); >+ >+ intel_ddi_set_dp_msa(pipe_config, conn_state); >+ extra new line here, otherwise Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi > } > > static void intel_mst_enable_dp(struct intel_encoder *encoder, >-- >2.23.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-07 23:22 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-06 21:26 [PATCH] drm/i915: Split a setting of MSA to MST and SST Gwan-gyeong Mun 2019-11-06 21:26 ` [Intel-gfx] " Gwan-gyeong Mun 2019-11-06 23:59 ` ✗ Fi.CI.BAT: failure for " Patchwork 2019-11-06 23:59 ` [Intel-gfx] " Patchwork 2019-11-07 17:11 ` ✗ Fi.CI.BAT: failure for drm/i915: Split a setting of MSA to MST and SST (rev2) Patchwork 2019-11-07 17:11 ` [Intel-gfx] " Patchwork 2019-11-07 21:16 ` [PATCH] drm/i915: Split a setting of MSA to MST and SST Souza, Jose 2019-11-07 21:16 ` [Intel-gfx] " Souza, Jose 2019-11-11 11:46 ` Saarinen, Jani 2019-11-11 11:46 ` [Intel-gfx] " Saarinen, Jani 2019-11-11 15:04 ` Mun, Gwan-gyeong 2019-11-11 15:04 ` [Intel-gfx] " Mun, Gwan-gyeong 2019-11-11 15:31 ` Saarinen, Jani 2019-11-11 15:31 ` [Intel-gfx] " Saarinen, Jani 2019-11-07 21:46 ` ✓ Fi.CI.BAT: success for drm/i915: Split a setting of MSA to MST and SST (rev3) Patchwork 2019-11-07 21:46 ` [Intel-gfx] " Patchwork 2019-11-07 23:22 ` Lucas De Marchi [this message] 2019-11-07 23:22 ` [Intel-gfx] [PATCH] drm/i915: Split a setting of MSA to MST and SST Lucas De Marchi 2019-11-11 14:27 ` Ville Syrjälä 2019-11-11 14:27 ` [Intel-gfx] " Ville Syrjälä 2019-11-09 5:16 ` ✗ Fi.CI.IGT: failure for drm/i915: Split a setting of MSA to MST and SST (rev3) Patchwork 2019-11-09 5:16 ` [Intel-gfx] " Patchwork 2019-11-11 14:57 ` Mun, Gwan-gyeong 2019-11-11 14:57 ` [Intel-gfx] " Mun, Gwan-gyeong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191107232233.spekqqkutv4b2s5w@ldmartin-desk1 \ --to=lucas.demarchi@intel.com \ --cc=gwan-gyeong.mun@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.