1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From 2c8f7ec321163fdbab1722f5b04b3482a58ae5fc Mon Sep 17 00:00:00 2001
From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Mon, 27 Mar 2017 09:59:38 -0400
Subject: [PATCH 0307/4131] drm/amd/display: Fix MPO exit and cursor issue.
Signed-off-by: Yongqiang Sun <yongqiang.sun@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>
---
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 ++++-
drivers/gpu/drm/amd/display/dc/dc.h | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index 512a53b..bf209f7 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -215,7 +215,7 @@ bool dc_stream_set_cursor_attributes(
bool dc_stream_set_cursor_position(
const struct dc_stream *dc_stream,
- const struct dc_cursor_position *position)
+ struct dc_cursor_position *position)
{
int i;
struct core_stream *stream;
@@ -251,6 +251,9 @@ bool dc_stream_set_cursor_position(
.h_scale_ratio = pipe_ctx->scl_data.ratios.horz,
};
+ if (pipe_ctx->top_pipe && pipe_ctx->surface != pipe_ctx->top_pipe->surface)
+ position->enable = false;
+
ipp->funcs->ipp_cursor_set_position(ipp, position, ¶m);
ret = true;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index b3d5b92..0731045 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -744,7 +744,7 @@ bool dc_stream_set_cursor_attributes(
bool dc_stream_set_cursor_position(
const struct dc_stream *stream,
- const struct dc_cursor_position *position);
+ struct dc_cursor_position *position);
/* Newer interfaces */
struct dc_cursor {
--
2.7.4
|
