drm/amd/display: fix recout calculation for left side clip

Recout calculation does not corrrectly handle plane
clip rect that extends beyond the left most border
of stream source rect. This change adds handling by
truncating the invisible clip rect.

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 2932116b7ac0e48cf7fa2f97597bf91d14e82cc1..4790159fef82c43b53dce185b97bb18f7abce6af 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -823,6 +823,8 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)
        } else
                data->recout.x = 0;
 
+       if (stream->src.x > surf_clip.x)
+               surf_clip.width -= stream->src.x - surf_clip.x;
        data->recout.width = surf_clip.width * stream->dst.width / stream->src.width;
        if (data->recout.width + data->recout.x > stream->dst.x + stream->dst.width)
                data->recout.width = stream->dst.x + stream->dst.width - data->recout.x;
@@ -831,6 +833,8 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx)
        if (stream->src.y < surf_clip.y)
                data->recout.y += (surf_clip.y - stream->src.y) * stream->dst.height
                                                / stream->src.height;
+       else if (stream->src.y > surf_clip.y)
+               surf_clip.height -= stream->src.y - surf_clip.y;
 
        data->recout.height = surf_clip.height * stream->dst.height / stream->src.height;
        if (data->recout.height + data->recout.y > stream->dst.y + stream->dst.height)