drm/amd/display: disable seamless vp adjustment for mirrored surface

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@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 a215c5b74cbd01989e680f4dce7f0ad737725c09..a6f8c1f936937103087af79b9044cf0178ffcf12 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -696,7 +696,7 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r
 
 
        /* Adjust for viewport end clip-off */
-       if ((data->viewport.x + data->viewport.width) < (src.x + src.width)) {
+       if ((data->viewport.x + data->viewport.width) < (src.x + src.width) && !flip_horz_scan_dir) {
                int vp_clip = src.x + src.width - data->viewport.width - data->viewport.x;
                int int_part = dal_fixed31_32_floor(
                                dal_fixed31_32_sub(data->inits.h, data->ratios.horz));
@@ -704,7 +704,7 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r
                int_part = int_part > 0 ? int_part : 0;
                data->viewport.width += int_part < vp_clip ? int_part : vp_clip;
        }
-       if ((data->viewport.y + data->viewport.height) < (src.y + src.height)) {
+       if ((data->viewport.y + data->viewport.height) < (src.y + src.height) && !flip_vert_scan_dir) {
                int vp_clip = src.y + src.height - data->viewport.height - data->viewport.y;
                int int_part = dal_fixed31_32_floor(
                                dal_fixed31_32_sub(data->inits.v, data->ratios.vert));
@@ -712,7 +712,7 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r
                int_part = int_part > 0 ? int_part : 0;
                data->viewport.height += int_part < vp_clip ? int_part : vp_clip;
        }
-       if ((data->viewport_c.x + data->viewport_c.width) < (src.x + src.width) / vpc_div) {
+       if ((data->viewport_c.x + data->viewport_c.width) < (src.x + src.width) / vpc_div && !flip_horz_scan_dir) {
                int vp_clip = (src.x + src.width) / vpc_div -
                                data->viewport_c.width - data->viewport_c.x;
                int int_part = dal_fixed31_32_floor(
@@ -721,7 +721,7 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct view *r
                int_part = int_part > 0 ? int_part : 0;
                data->viewport_c.width += int_part < vp_clip ? int_part : vp_clip;
        }
-       if ((data->viewport_c.y + data->viewport_c.height) < (src.y + src.height) / vpc_div) {
+       if ((data->viewport_c.y + data->viewport_c.height) < (src.y + src.height) / vpc_div && !flip_vert_scan_dir) {
                int vp_clip = (src.y + src.height) / vpc_div -
                                data->viewport_c.height - data->viewport_c.y;
                int int_part = dal_fixed31_32_floor(