Commit 16fb2a41 authored by Stylon Wang's avatar Stylon Wang Committed by Alex Deucher
Browse files

drm/amd/display: Add missing lines of code in dc.c 



[Why & How]
A critial part of "drm/amd/display: Fix windowed MPO video with ODM
combine for DCN32" is lost during promotion to upstream. This patch
addes the code back to dc.c.

Signed-off-by: default avatarStylon Wang <stylon.wang@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d955a06

drivers/gpu/drm/amd/display/dc/core/dc.c

+3 −2
Original line number Diff line number Diff line
@@ -3096,6 +3096,9 @@ static bool update_planes_and_stream_state(struct dc *dc, 
	if (update_type >= update_surface_trace_level)

		update_surface_trace(dc, srf_updates, surface_count);



	for (i = 0; i < surface_count; i++)

		copy_surface_update_to_plane(srf_updates[i].surface, &srf_updates[i]);



	if (update_type >= UPDATE_TYPE_FULL) {

		struct dc_plane_state *new_planes[MAX_SURFACES] = {0};
@@ -3137,8 +3140,6 @@ static bool update_planes_and_stream_state(struct dc *dc, 
	for (i = 0; i < surface_count; i++) {

		struct dc_plane_state *surface = srf_updates[i].surface;



		copy_surface_update_to_plane(surface, &srf_updates[i]);



		if (update_type >= UPDATE_TYPE_MED) {

			for (j = 0; j < dc->res_pool->pipe_count; j++) {

				struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];