diff options
| author | Andrew Jiang <Andrew.Jiang@amd.com> | 2017-11-07 22:54:56 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 20:47:41 +0300 |
| commit | 9f89df7d9bdff3b12ba50183420e1177b259f0e6 (patch) | |
| tree | 3dfd07bafaf642af8550515c86f8cdf94c073e40 /drivers | |
| parent | e7f93e906748499951a76e9035ac8f6e85c0a110 (diff) | |
| download | linux-9f89df7d9bdff3b12ba50183420e1177b259f0e6.tar.xz | |
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 <Andrew.Jiang@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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 19 |
1 files 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 3808b562a59f..3497d827b877 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1159,9 +1159,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)); @@ -1185,11 +1183,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; @@ -1252,10 +1245,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; @@ -1264,7 +1255,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; @@ -1299,7 +1290,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; |