Commit 8d0f4cd2 authored by Samson Tam's avatar Samson Tam Committed by Alex Deucher
Browse files

drm/amd/display: add null check for invalid opps 



[Why]
In cases where number of pipes available is less
 than num_opp, there will opp instances that are
 null

[How]
Add null check to skip over these opp instances

Fixes: 40de8403 ("drm/amd/display: Update OPP counter from new interface")
Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Acked-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarSamson Tam <samson.tam@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f583db81

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

+2 −1
Original line number Diff line number Diff line
@@ -3575,7 +3575,8 @@ static void wait_for_outstanding_hw_updates(struct dc *dc, const struct dc_state 
		mpcc_inst = hubp->inst;

		// MPCC inst is equal to pipe index in practice

		for (opp_inst = 0; opp_inst < opp_count; opp_inst++) {

			if (dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[mpcc_inst]) {

			if ((dc->res_pool->opps[opp_inst] != NULL) &&

				(dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[mpcc_inst])) {

				dc->res_pool->mpc->funcs->wait_for_idle(dc->res_pool->mpc, mpcc_inst);

				dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[mpcc_inst] = false;

				break;