drm/amd/display: Fix multiple cursors when using 4 displays on a contiguous large...

[Why & How]
Remove some cursor offset calculations for rotated cursor for fixing a bug where multiple cursors are seen.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Signed-off-by: Nevenko Stupar <nevenko.stupar@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/hwss/dcn401/dcn401_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
index 407a45a3ae2c63003d2f6a5f9b232143d5107624..b9541d5ab601a7fca3244009a537d3b12974d5c5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
@@ -1126,10 +1126,6 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx)
         */
 
        if (param.rotation == ROTATION_ANGLE_90 || param.rotation == ROTATION_ANGLE_270) {
-               x_pos = pipe_ctx->stream->dst.x + x_pos * pipe_ctx->stream->dst.width /
-                       pipe_ctx->stream->src.height;
-               y_pos = pipe_ctx->stream->dst.y + y_pos * pipe_ctx->stream->dst.height /
-                       pipe_ctx->stream->src.width;
        } else {
                x_pos = pipe_ctx->stream->dst.x + x_pos * pipe_ctx->stream->dst.width /
                        pipe_ctx->stream->src.width;
@@ -1225,15 +1221,6 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx)
                        }
                }
        } else if (param.rotation == ROTATION_ANGLE_90) {
-               if (!param.mirror) {
-                       uint32_t temp_y = pos_cpy.y;
-
-                       pos_cpy.y = pipe_ctx->plane_res.scl_data.recout.height - pos_cpy.x;
-                       pos_cpy.x = temp_y - prev_odm_width;
-               } else {
-                       swap(pos_cpy.x, pos_cpy.y);
-               }
-
        } else if (param.rotation == ROTATION_ANGLE_270) {
                // Swap axis and mirror vertically
                uint32_t temp_x = pos_cpy.x;
@@ -1284,15 +1271,6 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx)
                                pos_cpy.y = temp_x;
                        }
                } else {
-                       if (param.mirror) {
-                               swap(pos_cpy.x, pos_cpy.y);
-
-                               pos_cpy.x = pipe_ctx->plane_res.scl_data.recout.width - pos_cpy.x + 2 * pipe_ctx->plane_res.scl_data.recout.x;
-                               pos_cpy.y = (2 * pipe_ctx->plane_res.scl_data.recout.y) + pipe_ctx->plane_res.scl_data.recout.height - pos_cpy.y;
-                       } else {
-                               pos_cpy.x = pipe_ctx->plane_res.scl_data.recout.width - pos_cpy.y;
-                               pos_cpy.y = temp_x;
-                       }
                }
        } else if (param.rotation == ROTATION_ANGLE_180) {
                // Mirror horizontally and vertically
@@ -1320,7 +1298,6 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx)
                                        }
                                }
                        } else {
-                               pos_cpy.x = recout_width - pos_cpy.x + 2 * recout_x;
                        }
                }
 
@@ -1332,8 +1309,6 @@ void dcn401_set_cursor_position(struct pipe_ctx *pipe_ctx)
                 * Simplify it as:
                 *   pos_cpy.y = recout.y * 2 + recout.height - pos_cpy.y
                 */
-               pos_cpy.y = (2 * pipe_ctx->plane_res.scl_data.recout.y) +
-                       pipe_ctx->plane_res.scl_data.recout.height - pos_cpy.y;
        }
 
        hubp->funcs->set_cursor_position(hubp, &pos_cpy, &param);