From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Fri, 28 Apr 2017 13:56:08 +0000 (-0400)
Subject: drm/amd/display: Disable cursor on video surface.
X-Git-Tag: Ubuntu-5.2.0-15.16~5530^2~23^2~540
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cf4cde2b0b678ca1cf56d7b397c78b1bc3d3155b;p=mirror_ubuntu-eoan-kernel.git

drm/amd/display: Disable cursor on video surface.

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>
---

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 99b6a1695f26..4ba446de4d00 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -250,6 +250,10 @@ bool dc_stream_set_cursor_position(
 				!pipe_ctx->ipp || !pipe_ctx->surface)
 			continue;
 
+		if (pipe_ctx->surface->public.address.type
+				== PLN_ADDR_TYPE_VIDEO_PROGRESSIVE)
+			pos_cpy.enable = false;
+
 		if (pipe_ctx->top_pipe && pipe_ctx->surface != pipe_ctx->top_pipe->surface)
 			pos_cpy.enable = false;