summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYongqiang Sun2017-10-18 17:59:13 +0200
committerAlex Deucher2017-12-04 22:33:23 +0100
commit7d2638a61ad16aa7145cd3b68ae5757ab988ccab (patch)
treebbb8d13bf46ed3ff0536bcd6756ef3e49c76abf0
parentdrm/amd/display: Explicit casting for grph object ids (diff)
downloadkernel-qcow2-linux-7d2638a61ad16aa7145cd3b68ae5757ab988ccab.tar.gz
kernel-qcow2-linux-7d2638a61ad16aa7145cd3b68ae5757ab988ccab.tar.xz
kernel-qcow2-linux-7d2638a61ad16aa7145cd3b68ae5757ab988ccab.zip
drm/amd/display: Set cursor position as per address.
In case of pipe split, cursor position should also be programmed as per cursor address. Signed-off-by: Yongqiang Sun <yongqiang.sun@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>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index b477a6508db4..40178d8251b8 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -2414,7 +2414,6 @@ static void program_all_pipe_in_tree(
}
if (pipe_ctx->plane_state != NULL) {
- struct dc_cursor_position position = { 0 };
struct pipe_ctx *cur_pipe_ctx =
&dc->current_state->res_ctx.pipe_ctx[pipe_ctx->pipe_idx];
@@ -2434,11 +2433,13 @@ static void program_all_pipe_in_tree(
update_dchubp_dpp(dc, pipe_ctx, context);
/* TODO: this is a hack w/a for switching from mpo to pipe split */
- dc_stream_set_cursor_position(pipe_ctx->stream, &position);
+ if (pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {
+ struct dc_cursor_position position = { 0 };
- if (pipe_ctx->stream->cursor_attributes.address.quad_part != 0)
+ dc_stream_set_cursor_position(pipe_ctx->stream, &position);
dc_stream_set_cursor_attributes(pipe_ctx->stream,
&pipe_ctx->stream->cursor_attributes);
+ }
if (cur_pipe_ctx->plane_state != pipe_ctx->plane_state) {
dc->hwss.set_input_transfer_func(