drm/amd/display: fix recout calculation for left side clip
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Mon, 26 Oct 2020 15:48:58 +0000 (11:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Nov 2020 20:32:37 +0000 (15:32 -0500)
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>
drivers/gpu/drm/amd/display/dc/core/dc_resource.c

index 2932116..4790159 100644 (file)
@@ -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)