Skip to content

Commit a5ce869

Browse files
superm1alexdeucher
authored andcommitted
drm/amd/display: Avoid configuring PSR granularity if PSR-SU not supported
[Why] If PSR-SU is disabled on the link, then configuring su_y granularity in mod_power_calc_psr_configs() can lead to assertions in psr_su_set_dsc_slice_height(). [How] Check the PSR version in amdgpu_dm_link_setup_psr() to determine whether or not to configure granularity. Reviewed-by: Sun peng (Leo) Li <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Ivan Lipski <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 02f3ec5 commit a5ce869

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream)
119119
psr_config.allow_multi_disp_optimizations =
120120
(amdgpu_dc_feature_mask & DC_PSR_ALLOW_MULTI_DISP_OPT);
121121

122-
if (!psr_su_set_dsc_slice_height(dc, link, stream, &psr_config))
123-
return false;
122+
if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) {
123+
if (!psr_su_set_dsc_slice_height(dc, link, stream, &psr_config))
124+
return false;
125+
}
124126

125127
ret = dc_link_setup_psr(link, stream, &psr_config, &psr_context);
126128

0 commit comments

Comments
 (0)