Commit 02ce5a79 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix odm mpo disable 



It looks like mpo isn't properly disabled during odm, this change is
meant to fix that.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarNikola Cornij <Nikola.Cornij@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 72c6473a

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+6 −5
Original line number Diff line number Diff line
@@ -2153,6 +2153,11 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, 
		} else

			need_split = context->bw_ctx.dml.vba.NoOfDPP[vlevel][context->bw_ctx.dml.vba.maxMpcComb][pipe_idx] == 2;



		/* We do not support mpo + odm at the moment */

		if (hsplit_pipe && hsplit_pipe->plane_state != pipe->plane_state

				&& context->bw_ctx.dml.vba.ODMCombineEnabled[pipe_idx])

			goto validate_fail;



		if (need_split3d || need_split || force_split) {

			if (!hsplit_pipe || hsplit_pipe->plane_state != pipe->plane_state) {

				/* pipe not split previously needs split */
@@ -2168,11 +2173,7 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, 
					goto validate_fail;

				pipe_split_from[hsplit_pipe->pipe_idx] = pipe_idx;

			}

		} else if (hsplit_pipe && hsplit_pipe->plane_state != pipe->plane_state) {

			/* We do not support mpo + odm at the moment */

			if (context->bw_ctx.dml.vba.ODMCombineEnabled[pipe_idx])

				goto validate_fail;

		} else if (hsplit_pipe) {

		} else if (hsplit_pipe && hsplit_pipe->plane_state == pipe->plane_state) {

			/* merge should already have been done */

			ASSERT(0);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE