diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5082-drm-amd-display-correct-image-viewport-calculation.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5082-drm-amd-display-correct-image-viewport-calculation.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5082-drm-amd-display-correct-image-viewport-calculation.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5082-drm-amd-display-correct-image-viewport-calculation.patch new file mode 100644 index 00000000..db1a3b2d --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5082-drm-amd-display-correct-image-viewport-calculation.patch @@ -0,0 +1,97 @@ +From 2f15e88819e98ad1188e9104329cb19acb49f55f Mon Sep 17 00:00:00 2001 +From: Martin Tsai <Martin.Tsai@amd.com> +Date: Fri, 27 Jul 2018 15:39:47 +0800 +Subject: [PATCH 5082/5725] drm/amd/display: correct image viewport calculation + +[why] +We didn't transfer the camera/video viewport coordinate +when doing rotation and mirror. + +[how] +To correct the viewport coordinate in calculate_viewport(). + +Signed-off-by: Martin Tsai <Martin.Tsai@amd.com> +Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> +Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 49 +++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + +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 1f3aa4a..bd525e8 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -468,6 +468,18 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) + pipe_ctx->bottom_pipe->plane_state == pipe_ctx->plane_state; + bool sec_split = pipe_ctx->top_pipe && + pipe_ctx->top_pipe->plane_state == pipe_ctx->plane_state; ++ bool flip_vert_scan_dir = false, flip_horz_scan_dir = false; ++ ++ /* ++ * Need to calculate the scan direction for viewport to properly determine offset ++ */ ++ if (pipe_ctx->plane_state->rotation == ROTATION_ANGLE_180) { ++ flip_vert_scan_dir = true; ++ flip_horz_scan_dir = true; ++ } else if (pipe_ctx->plane_state->rotation == ROTATION_ANGLE_90) ++ flip_vert_scan_dir = true; ++ else if (pipe_ctx->plane_state->rotation == ROTATION_ANGLE_270) ++ flip_horz_scan_dir = true; + + if (stream->view_format == VIEW_3D_FORMAT_SIDE_BY_SIDE || + stream->view_format == VIEW_3D_FORMAT_TOP_AND_BOTTOM) { +@@ -511,6 +523,34 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) + data->viewport.height = clip.height * + surf_src.height / plane_state->dst_rect.height; + ++ /* To transfer the x, y to correct coordinate on mirror image (camera). ++ * deg 0 : transfer x, ++ * deg 90 : don't need to transfer, ++ * deg180 : transfer y, ++ * deg270 : transfer x and y. ++ * To transfer the x, y to correct coordinate on non-mirror image (video). ++ * deg 0 : don't need to transfer, ++ * deg 90 : transfer y, ++ * deg180 : transfer x and y, ++ * deg270 : transfer x. ++ */ ++ if (pipe_ctx->plane_state->horizontal_mirror) { ++ if (flip_horz_scan_dir && !flip_vert_scan_dir) { ++ data->viewport.y = surf_src.height - data->viewport.y - data->viewport.height; ++ data->viewport.x = surf_src.width - data->viewport.x - data->viewport.width; ++ } else if (flip_horz_scan_dir && flip_vert_scan_dir) ++ data->viewport.y = surf_src.height - data->viewport.y - data->viewport.height; ++ else { ++ if (!flip_horz_scan_dir && !flip_vert_scan_dir) ++ data->viewport.x = surf_src.width - data->viewport.x - data->viewport.width; ++ } ++ } else { ++ if (flip_horz_scan_dir) ++ data->viewport.x = surf_src.width - data->viewport.x - data->viewport.width; ++ if (flip_vert_scan_dir) ++ data->viewport.y = surf_src.height - data->viewport.y - data->viewport.height; ++ } ++ + /* Round down, compensate in init */ + data->viewport_c.x = data->viewport.x / vpc_div; + data->viewport_c.y = data->viewport.y / vpc_div; +@@ -706,6 +746,15 @@ static void calculate_inits_and_adj_vp(struct pipe_ctx *pipe_ctx, struct rect *r + rect_swap_helper(&src); + rect_swap_helper(&data->viewport_c); + rect_swap_helper(&data->viewport); ++ ++ if (pipe_ctx->plane_state->rotation == ROTATION_ANGLE_270 && ++ pipe_ctx->plane_state->horizontal_mirror) { ++ flip_vert_scan_dir = true; ++ } ++ if (pipe_ctx->plane_state->rotation == ROTATION_ANGLE_90 && ++ pipe_ctx->plane_state->horizontal_mirror) { ++ flip_vert_scan_dir = false; ++ } + } else if (pipe_ctx->plane_state->horizontal_mirror) + flip_horz_scan_dir = !flip_horz_scan_dir; + +-- +2.7.4 + |