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 202260f64519e591b5cd99626e441b6559f571a3.
Unified · Split
| @@ -6305,9 +6305,8 @@ create_stream_for_sink(struct drm_connector *connector, · 6304 unmodified lines | ||
| 6305 | 6305 | |
| 6306 | 6306 | if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) |
| 6307 | 6307 | mod_build_hf_vsif_infopacket(stream, &stream->vsp_infopacket); |
| 6308 | − else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT || | |
| 6309 | − stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST || | |
| 6310 | − stream->signal == SIGNAL_TYPE_EDP) { | |
| 6308 | + | |
| 6309 | + if (stream->link->psr_settings.psr_feature_enabled || stream->link->replay_settings.replay_feature_enabled) { | |
| 6311 | 6310 | // |
| 6312 | 6311 | // should decide stream support vsc sdp colorimetry capability |
| 6313 | 6312 | // before building vsc info packet |
| @@ -6323,9 +6322,8 @@ create_stream_for_sink(struct drm_connector *connector, · 9 unmodified lines | ||
| 6323 | 6322 | if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22) |
| 6324 | 6323 | tf = TRANSFER_FUNC_GAMMA_22; |
| 6325 | 6324 | mod_build_vsc_infopacket(stream, &stream->vsc_infopacket, stream->output_color_space, tf); |
| 6325 | + aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY; | |
| 6326 | 6326 | |
| 6327 | − if (stream->link->psr_settings.psr_feature_enabled) | |
| 6328 | − aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY; | |
| 6329 | 6327 | } |
| 6330 | 6328 | finish: |
| 6331 | 6329 | dc_sink_release(sink); |
| @@ -147,15 +147,12 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream, · 146 unmodified lines | ||
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /* VSC packet set to 4 for PSR-SU, or 2 for PSR1 */ |
| 150 | − if (stream->link->psr_settings.psr_feature_enabled) { | |
| 151 | − if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) | |
| 152 | − vsc_packet_revision = vsc_packet_rev4; | |
| 153 | − else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1) | |
| 154 | − vsc_packet_revision = vsc_packet_rev2; | |
| 155 | − } | |
| 156 | − | |
| 157 | − if (stream->link->replay_settings.config.replay_supported) | |
| 150 | + if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) | |
| 151 | + vsc_packet_revision = vsc_packet_rev4; | |
| 152 | + else if (stream->link->replay_settings.config.replay_supported) | |
| 158 | 153 | vsc_packet_revision = vsc_packet_rev4; |
| 154 | + else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1) | |
| 155 | + vsc_packet_revision = vsc_packet_rev2; | |
| 159 | 156 | |
| 160 | 157 | /* Update to revision 5 for extended colorimetry support */ |
| 161 | 158 | if (stream->use_vsc_sdp_for_colorimetry) |