From 81161e59f54bcc0dcc3c15015e27ea21b1022df1 Mon Sep 17 00:00:00 2001 From: Reza Amini Date: Fri, 17 Mar 2017 15:24:09 -0400 Subject: [PATCH 0314/4131] drm/amd/display: remove surface validation against stream rect Surface information is by default copied from old context in dc_commit_stream. Thus unchange streams will not be affected. For new streams, we shouldn't validate the new mode against the surface configuration of old_context. Signed-off-by: Reza Amini Acked-by: Harry Wentland Reviewed-by: Tony Cheng Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 5 ----- drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 5 ----- 4 files changed, 20 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c index d1685df..7fae853 100644 --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c @@ -788,11 +788,6 @@ static bool dce100_validate_surface_sets( if (set[i].surface_count > 1) return false; - if (set[i].surfaces[0]->clip_rect.width - < set[i].stream->src.width - || set[i].surfaces[0]->clip_rect.height - < set[i].stream->src.height) - return false; if (set[i].surfaces[0]->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) return false; diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c index 065a298..b4ab438 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c @@ -1007,11 +1007,6 @@ static bool dce110_validate_surface_sets( if (set[i].surface_count > 2) return false; - if (set[i].surfaces[0]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0]->clip_rect.height - > set[i].stream->src.height) - return false; if (set[i].surfaces[0]->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) return false; diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c index ece3ec7..0a1ad28 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c @@ -972,11 +972,6 @@ static bool dce112_validate_surface_sets( if (set[i].surface_count > 1) return false; - if (set[i].surfaces[0]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0]->clip_rect.height - > set[i].stream->src.height) - return false; if (set[i].surfaces[0]->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) return false; diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c index 752e0e7..ab8cee3 100644 --- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c @@ -804,11 +804,6 @@ static bool dce80_validate_surface_sets( if (set[i].surface_count > 1) return false; - if (set[i].surfaces[0]->clip_rect.width - > set[i].stream->src.width - || set[i].surfaces[0]->clip_rect.height - > set[i].stream->src.height) - return false; if (set[i].surfaces[0]->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) return false; -- 2.7.4