]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu/display: Fix a mistake in revert commit
authorFangzhi Zuo <Jerry.Zuo@amd.com>
Tue, 27 Aug 2024 20:08:13 +0000 (16:08 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:38:28 +0000 (16:38 +0200)
commit 7745a1dee0a687044888179e6e7fcd6d704992a9 upstream.

[why]
It is to fix in try_disable_dsc() due to misrevert of
commit 338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")

[How]
Fix restoring minimum compression bw by 'max_kbps', instead of native bw 'stream_kbps'

Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Mario Limonciello <superm1@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

index 0859a7173a06f64a4636c49c9207f2ec31e401db..6b5eed37532b9773b3a293abb9239701a1f7fd2c 100644 (file)
@@ -1072,7 +1072,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
                        vars[next_index].bpp_x16 = 0;
                } else {
                        DRM_DEBUG_DRIVER("MST_DSC index #%d, restore minimum compression\n", next_index);
-                       vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
+                       vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.max_kbps, fec_overhead_multiplier_x1000);
                        ret = drm_dp_atomic_find_time_slots(state,
                                                            params[next_index].port->mgr,
                                                            params[next_index].port,