* [PATCH] Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR"
@ 2024-03-12 15:24 Harry Wentland
2024-03-20 20:10 ` Rodrigo Siqueira Jordao
0 siblings, 1 reply; 2+ messages in thread
From: Harry Wentland @ 2024-03-12 15:24 UTC (permalink / raw)
To: amd-gfx; +Cc: Harry Wentland
This causes flicker on a bunch of eDP panels. The info_packet code
also caused regressions on other OSes that we haven't' seen on Linux
yet, but that is likely due to the fact that we haven't had a chance
to test those environments on Linux.
We'll need to revisit this.
This reverts commit bfd4e0b7eb4467f9db5bb37268565afec6cf513e.
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3207
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3151
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++-----
.../amd/display/modules/info_packet/info_packet.c | 13 +++++--------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index cffb2655177c..6a61eb4148ad 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6302,9 +6302,8 @@ create_stream_for_sink(struct drm_connector *connector,
if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
mod_build_hf_vsif_infopacket(stream, &stream->vsp_infopacket);
- else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
- stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
- stream->signal == SIGNAL_TYPE_EDP) {
+
+ if (stream->link->psr_settings.psr_feature_enabled || stream->link->replay_settings.replay_feature_enabled) {
//
// should decide stream support vsc sdp colorimetry capability
// before building vsc info packet
@@ -6320,9 +6319,8 @@ create_stream_for_sink(struct drm_connector *connector,
if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)
tf = TRANSFER_FUNC_GAMMA_22;
mod_build_vsc_infopacket(stream, &stream->vsc_infopacket, stream->output_color_space, tf);
+ aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
- if (stream->link->psr_settings.psr_feature_enabled)
- aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
}
finish:
dc_sink_release(sink);
diff --git a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
index 738ee763f24a..84f9b412a4f1 100644
--- a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
+++ b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
@@ -147,15 +147,12 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream,
}
/* VSC packet set to 4 for PSR-SU, or 2 for PSR1 */
- if (stream->link->psr_settings.psr_feature_enabled) {
- if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
- vsc_packet_revision = vsc_packet_rev4;
- else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
- vsc_packet_revision = vsc_packet_rev2;
- }
-
- if (stream->link->replay_settings.config.replay_supported)
+ if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
vsc_packet_revision = vsc_packet_rev4;
+ else if (stream->link->replay_settings.config.replay_supported)
+ vsc_packet_revision = vsc_packet_rev4;
+ else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
+ vsc_packet_revision = vsc_packet_rev2;
/* Update to revision 5 for extended colorimetry support */
if (stream->use_vsc_sdp_for_colorimetry)
--
2.44.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR"
2024-03-12 15:24 [PATCH] Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR" Harry Wentland
@ 2024-03-20 20:10 ` Rodrigo Siqueira Jordao
0 siblings, 0 replies; 2+ messages in thread
From: Rodrigo Siqueira Jordao @ 2024-03-20 20:10 UTC (permalink / raw)
To: Harry Wentland, amd-gfx
On 3/12/24 9:24 AM, Harry Wentland wrote:
> This causes flicker on a bunch of eDP panels. The info_packet code
> also caused regressions on other OSes that we haven't' seen on Linux
> yet, but that is likely due to the fact that we haven't had a chance
> to test those environments on Linux.
>
> We'll need to revisit this.
>
> This reverts commit bfd4e0b7eb4467f9db5bb37268565afec6cf513e.
>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3207
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3151
> Signed-off-by: Harry Wentland <harry.wentland@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++-----
> .../amd/display/modules/info_packet/info_packet.c | 13 +++++--------
> 2 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index cffb2655177c..6a61eb4148ad 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -6302,9 +6302,8 @@ create_stream_for_sink(struct drm_connector *connector,
>
> if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
> mod_build_hf_vsif_infopacket(stream, &stream->vsp_infopacket);
> - else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
> - stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
> - stream->signal == SIGNAL_TYPE_EDP) {
> +
> + if (stream->link->psr_settings.psr_feature_enabled || stream->link->replay_settings.replay_feature_enabled) {
> //
> // should decide stream support vsc sdp colorimetry capability
> // before building vsc info packet
> @@ -6320,9 +6319,8 @@ create_stream_for_sink(struct drm_connector *connector,
> if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)
> tf = TRANSFER_FUNC_GAMMA_22;
> mod_build_vsc_infopacket(stream, &stream->vsc_infopacket, stream->output_color_space, tf);
> + aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
>
> - if (stream->link->psr_settings.psr_feature_enabled)
> - aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
> }
> finish:
> dc_sink_release(sink);
> diff --git a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
> index 738ee763f24a..84f9b412a4f1 100644
> --- a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
> +++ b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
> @@ -147,15 +147,12 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream,
> }
>
> /* VSC packet set to 4 for PSR-SU, or 2 for PSR1 */
> - if (stream->link->psr_settings.psr_feature_enabled) {
> - if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
> - vsc_packet_revision = vsc_packet_rev4;
> - else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
> - vsc_packet_revision = vsc_packet_rev2;
> - }
> -
> - if (stream->link->replay_settings.config.replay_supported)
> + if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
> vsc_packet_revision = vsc_packet_rev4;
> + else if (stream->link->replay_settings.config.replay_supported)
> + vsc_packet_revision = vsc_packet_rev4;
> + else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
> + vsc_packet_revision = vsc_packet_rev2;
>
> /* Update to revision 5 for extended colorimetry support */
> if (stream->use_vsc_sdp_for_colorimetry)
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-20 20:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-12 15:24 [PATCH] Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR" Harry Wentland
2024-03-20 20:10 ` Rodrigo Siqueira Jordao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox