From 287b7b91b968d87560afc7edc46b52aadb98b419 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Tue, 7 Nov 2017 14:54:56 -0500 Subject: [PATCH 2748/4131] drm/amd/display: Remove legacy unused workaround We shouldn't be able to get a non-visible plane into DC anymore. Signed-off-by: Andrew Jiang Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 301c790..fddca38 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1120,9 +1120,7 @@ static unsigned int pixel_format_to_bpp(enum surface_pixel_format format) } } -static enum surface_update_type get_plane_info_update_type( - const struct dc_surface_update *u, - int surface_index) +static enum surface_update_type get_plane_info_update_type(const struct dc_surface_update *u) { struct dc_plane_info temp_plane_info; memset(&temp_plane_info, 0, sizeof(temp_plane_info)); @@ -1146,11 +1144,6 @@ static enum surface_update_type get_plane_info_update_type( temp_plane_info.rotation = u->surface->rotation; temp_plane_info.stereo_format = u->surface->stereo_format; - if (surface_index == 0) - temp_plane_info.visible = u->plane_info->visible; - else - temp_plane_info.visible = u->surface->visible; - if (memcmp(u->plane_info, &temp_plane_info, sizeof(struct dc_plane_info)) != 0) return UPDATE_TYPE_FULL; @@ -1213,10 +1206,8 @@ static enum surface_update_type get_scaling_info_update_type( return UPDATE_TYPE_FAST; } -static enum surface_update_type det_surface_update( - const struct dc *dc, - const struct dc_surface_update *u, - int surface_index) +static enum surface_update_type det_surface_update(const struct dc *dc, + const struct dc_surface_update *u) { const struct dc_state *context = dc->current_state; enum surface_update_type type = UPDATE_TYPE_FAST; @@ -1225,7 +1216,7 @@ static enum surface_update_type det_surface_update( if (!is_surface_in_context(context, u->surface)) return UPDATE_TYPE_FULL; - type = get_plane_info_update_type(u, surface_index); + type = get_plane_info_update_type(u); if (overall_type < type) overall_type = type; @@ -1260,7 +1251,7 @@ enum surface_update_type dc_check_update_surfaces_for_stream( for (i = 0 ; i < surface_count; i++) { enum surface_update_type type = - det_surface_update(dc, &updates[i], i); + det_surface_update(dc, &updates[i]); if (type == UPDATE_TYPE_FULL) return type; -- 2.7.4