From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Tue, 13 Jun 2017 16:31:49 -0400
Subject: drm/amd/display: fix dc_check_update_surfaces_for_stream memcmp
sequence
Git-commit: 80b4c5a8c1e1856848a440a63accbe029ea3b51b
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@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.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1094,11 +1094,13 @@ static enum surface_update_type get_plan
const struct dc_surface_update *u,
int surface_index)
{
- struct dc_plane_info temp_plane_info = { 0 };
+ struct dc_plane_info temp_plane_info;
if (!u->plane_info)
return UPDATE_TYPE_FAST;
+ temp_plane_info = *u->plane_info;
+
/* Copy all parameters that will cause a full update
* from current surface, the rest of the parameters
* from provided plane configuration.
@@ -1115,10 +1117,6 @@ static enum surface_update_type get_plan
temp_plane_info.stereo_format = u->surface->stereo_format;
temp_plane_info.tiling_info = u->surface->tiling_info;
- /* Special Validation parameters */
- temp_plane_info.format = u->plane_info->format;
- temp_plane_info.per_pixel_alpha = u->plane_info->per_pixel_alpha;
-
if (surface_index == 0)
temp_plane_info.visible = u->plane_info->visible;
else