From: Vitaly Prosyak <vitaly.prosyak@amd.com>
Date: Mon, 27 Mar 2017 12:48:46 -0500
Subject: drm/amd/display: stereo support
Git-commit: 7b779c991d9422f677dff70d701eae448c7c696a
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Frame sequential, top-bottom and side-by-side support.
Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 34 ++++++++++++++++------
1 file changed, 26 insertions(+), 8 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -422,6 +422,11 @@ static void calculate_viewport(struct pi
bool sec_split = pipe_ctx->top_pipe &&
pipe_ctx->top_pipe->surface == pipe_ctx->surface;
+ if (stream->timing.timing_3d_format == TIMING_3D_FORMAT_SIDE_BY_SIDE ||
+ stream->timing.timing_3d_format == TIMING_3D_FORMAT_TOP_AND_BOTTOM) {
+ pri_split = false;
+ sec_split = false;
+ }
/* The actual clip is an intersection between stream
* source and surface clip
*/
@@ -532,14 +537,27 @@ static void calculate_recout(struct pipe
stream->public.dst.y + stream->public.dst.height
- pipe_ctx->scl_data.recout.y;
- /* Handle hsplit */
- if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface == pipe_ctx->surface) {
- pipe_ctx->scl_data.recout.width /= 2;
- pipe_ctx->scl_data.recout.x += pipe_ctx->scl_data.recout.width;
- /* Floor primary pipe, ceil 2ndary pipe */
- pipe_ctx->scl_data.recout.width += pipe_ctx->scl_data.recout.width % 2;
- } else if (pipe_ctx->bottom_pipe && pipe_ctx->bottom_pipe->surface == pipe_ctx->surface) {
- pipe_ctx->scl_data.recout.width /= 2;
+ /* Handle h & vsplit */
+ if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface ==
+ pipe_ctx->surface) {
+ if (stream->public.timing.timing_3d_format ==
+ TIMING_3D_FORMAT_TOP_AND_BOTTOM) {
+ pipe_ctx->scl_data.recout.height /= 2;
+ pipe_ctx->scl_data.recout.y += pipe_ctx->scl_data.recout.height;
+ /* Floor primary pipe, ceil 2ndary pipe */
+ pipe_ctx->scl_data.recout.height += pipe_ctx->scl_data.recout.height % 2;
+ } else {
+ pipe_ctx->scl_data.recout.width /= 2;
+ pipe_ctx->scl_data.recout.x += pipe_ctx->scl_data.recout.width;
+ pipe_ctx->scl_data.recout.width += pipe_ctx->scl_data.recout.width % 2;
+ }
+ } else if (pipe_ctx->bottom_pipe &&
+ pipe_ctx->bottom_pipe->surface == pipe_ctx->surface) {
+ if (stream->public.timing.timing_3d_format ==
+ TIMING_3D_FORMAT_TOP_AND_BOTTOM)
+ pipe_ctx->scl_data.recout.height /= 2;
+ else
+ pipe_ctx->scl_data.recout.width /= 2;
}
/* Unclipped recout offset = stream dst offset + ((surf dst offset - stream src offset)