drm/amd/display: Fix CAB allocation calculation

[Description]
Accidentally added when should have subtracted
in calculation

Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Jasdeep Dhillon <jdhillon@amd.com>
Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
index 0be0223f21bdddbf4b226a5e0032e1fe101eee2f..84a958d28f6a661812c8a6784444edfbb008231a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
@@ -243,7 +243,7 @@ static uint32_t dcn32_calculate_cab_allocation(struct dc *dc, struct dc_state *c
                 * mall_alloc_width_blk_aligned_l/c = full_vp_width_blk_aligned_l/c
                 */
                mall_alloc_width_blk_aligned = ((pipe->plane_res.scl_data.viewport.x +
-                               pipe->plane_res.scl_data.viewport.width + mblk_width - 1) / mblk_width * mblk_width) +
+                               pipe->plane_res.scl_data.viewport.width + mblk_width - 1) / mblk_width * mblk_width) -
                                                (pipe->plane_res.scl_data.viewport.x / mblk_width * mblk_width);
 
                /* full_vp_height_blk_aligned = FLOOR(vp_y_start + full_vp_height + blk_height - 1, blk_height) -
@@ -252,7 +252,7 @@ static uint32_t dcn32_calculate_cab_allocation(struct dc *dc, struct dc_state *c
                 * mall_alloc_height_blk_aligned_l/c = full_vp_height_blk_aligned_l/c
                 */
                mall_alloc_height_blk_aligned = ((pipe->plane_res.scl_data.viewport.y +
-                               pipe->plane_res.scl_data.viewport.height + mblk_height - 1) / mblk_height * mblk_height) +
+                               pipe->plane_res.scl_data.viewport.height + mblk_height - 1) / mblk_height * mblk_height) -
                                                (pipe->plane_res.scl_data.viewport.y / mblk_height * mblk_height);
 
                num_mblks = ((mall_alloc_width_blk_aligned + mblk_width - 1) / mblk_width) *