From: Leon Elazar <leon.elazar@amd.com>
Date: Tue, 17 Jan 2017 16:16:04 -0500
Subject: drm/amd/display: check surface size is at least as large as stream
Git-commit: 9c1a57d79dbc96e808ea81aa1385f2d9d03570a0
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Signed-off-by: Leon Elazar <leon.elazar@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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 4 ++--
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -967,9 +967,9 @@ static bool dce110_validate_surface_sets
return false;
if (set[i].surfaces[0]->src_rect.width
- != set[i].stream->src.width
+ < set[i].stream->src.width
|| set[i].surfaces[0]->src_rect.height
- != set[i].stream->src.height)
+ < set[i].stream->src.height)
return false;
if (set[i].surfaces[0]->format
>= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -966,9 +966,9 @@ static bool dce112_validate_surface_sets
return false;
if (set[i].surfaces[0]->clip_rect.width
- != set[i].stream->src.width
+ < set[i].stream->src.width
|| set[i].surfaces[0]->clip_rect.height
- != set[i].stream->src.height)
+ < set[i].stream->src.height)
return false;
if (set[i].surfaces[0]->format
>= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)