diff options
| author | Dmytro Laktyushkin | 2017-03-06 20:57:28 +0100 |
|---|---|---|
| committer | Alex Deucher | 2017-09-26 23:18:46 +0200 |
| commit | 9e6c74ceef866edf2cec380c8ce06ef73d56478d (patch) | |
| tree | 84fa094fcf95059bd8bfa6dd30e4e035a5e57b19 /drivers/gpu/drm/amd/display/dc/core/dc_resource.c | |
| parent | drm/amd/display: add init calculation to scaler params (diff) | |
| download | kernel-qcow2-linux-9e6c74ceef866edf2cec380c8ce06ef73d56478d.tar.gz kernel-qcow2-linux-9e6c74ceef866edf2cec380c8ce06ef73d56478d.tar.xz kernel-qcow2-linux-9e6c74ceef866edf2cec380c8ce06ef73d56478d.zip | |
drm/amd/display: fix hsplit viewport calculation for rotated/mirrored usecases
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core/dc_resource.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 47 |
1 files changed, 36 insertions, 11 deletions
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 d4b338fa4ab9..e34b52e28e52 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -412,6 +412,8 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) struct rect clip = {0}; int vpc_div = (data->format == PIXEL_FORMAT_420BPP12 || data->format == PIXEL_FORMAT_420BPP15) ? 2 : 1; + bool need_split = (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface == pipe_ctx->surface) + || (pipe_ctx->bottom_pipe && pipe_ctx->bottom_pipe->surface == pipe_ctx->surface); if (surface->rotation == ROTATION_ANGLE_90 || @@ -466,17 +468,40 @@ static void calculate_viewport(struct pipe_ctx *pipe_ctx) data->viewport_c.height = (data->viewport.height + vpc_div - 1) / vpc_div; /* Handle hsplit */ - if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface == pipe_ctx->surface) { - data->viewport.width /= 2; - data->viewport_c.width /= 2; - data->viewport.x += data->viewport.width; - data->viewport_c.x += data->viewport_c.width; - /* Floor primary pipe, ceil 2ndary pipe */ - data->viewport.width += data->viewport.width % 2; - data->viewport_c.width += data->viewport_c.width % 2; - } else if (pipe_ctx->bottom_pipe && pipe_ctx->bottom_pipe->surface == pipe_ctx->surface) { - data->viewport.width /= 2; - data->viewport_c.width /= 2; + if (need_split && (surface->rotation == ROTATION_ANGLE_90 || + surface->rotation == ROTATION_ANGLE_270)) { + bool lower_view = (surface->rotation == ROTATION_ANGLE_270) ^ + (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface == pipe_ctx->surface); + + if (lower_view) { + data->viewport.height /= 2; + data->viewport_c.height /= 2; + data->viewport.y += data->viewport.height; + data->viewport_c.y += data->viewport_c.height; + /* Ceil offset pipe */ + data->viewport.height += data->viewport.height % 2; + data->viewport_c.height += data->viewport_c.height % 2; + } else { + data->viewport.height /= 2; + data->viewport_c.height /= 2; + } + } else if (need_split) { + bool right_view = (surface->rotation == ROTATION_ANGLE_180) ^ + (pipe_ctx->top_pipe && pipe_ctx->top_pipe->surface == pipe_ctx->surface) ^ + surface->horizontal_mirror; + + if (right_view) { + data->viewport.width /= 2; + data->viewport_c.width /= 2; + data->viewport.x += data->viewport.width; + data->viewport_c.x += data->viewport_c.width; + /* Ceil offset pipe */ + data->viewport.width += data->viewport.width % 2; + data->viewport_c.width += data->viewport_c.width % 2; + } else { + data->viewport.width /= 2; + data->viewport_c.width /= 2; + } } } |