Commit 17caab0f authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher
Browse files

drm/amd/display: Remove assert for odm transition case 



Remove assert that will hit during odm transition case, since this is a
valid case.

Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5d4b5914

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c

+7 −3
Original line number Diff line number Diff line
@@ -98,9 +98,13 @@ void dcn32_program_det_size(struct hubbub *hubbub, int hubp_inst, unsigned int d 
	default:

		break;

	}

	/* Should never be hit, if it is we have an erroneous hw config*/

	ASSERT(hubbub2->det0_size + hubbub2->det1_size + hubbub2->det2_size

			+ hubbub2->det3_size + hubbub2->compbuf_size_segments <= hubbub2->crb_size_segs);

	if (hubbub2->det0_size + hubbub2->det1_size + hubbub2->det2_size

			+ hubbub2->det3_size + hubbub2->compbuf_size_segments > hubbub2->crb_size_segs) {

		/* This may happen during seamless transition from ODM 2:1 to ODM4:1 */

		DC_LOG_WARNING("CRB Config Warning: DET size (%d,%d,%d,%d) + Compbuf size (%d) >  CRB segments (%d)\n",

						hubbub2->det0_size, hubbub2->det1_size, hubbub2->det2_size, hubbub2->det3_size,

						hubbub2->compbuf_size_segments, hubbub2->crb_size_segs);

	}

}



static void dcn32_program_compbuf_size(struct hubbub *hubbub, unsigned int compbuf_size_kb, bool safe_to_increase)