Commit 95022795 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: Check if hubp function hooks exist before calling them 



Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a85538a

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+5 −5
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) 
			&dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe_ctx != NULL) {

			hubp = pipe_ctx->plane_res.hubp;

			if (hubp != NULL) {

			if (hubp != NULL && hubp->funcs->hubp_get_underflow_status) {

				if (hubp->funcs->hubp_get_underflow_status(hubp) != 0) {

					/* one pipe underflow, we will reset all the pipes*/

					need_recover = true;
@@ -813,7 +813,7 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) 
		if (pipe_ctx != NULL) {

			hubp = pipe_ctx->plane_res.hubp;

			/*DCHUBP_CNTL:HUBP_BLANK_EN=1*/

			if (hubp != NULL)

			if (hubp != NULL && hubp->funcs->set_hubp_blank_en)

				hubp->funcs->set_hubp_blank_en(hubp, true);

		}

	}
@@ -826,7 +826,7 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) 
		if (pipe_ctx != NULL) {

			hubp = pipe_ctx->plane_res.hubp;

			/*DCHUBP_CNTL:HUBP_DISABLE=1*/

			if (hubp != NULL)

			if (hubp != NULL && hubp->funcs->hubp_disable_control)

				hubp->funcs->hubp_disable_control(hubp, true);

		}

	}
@@ -836,7 +836,7 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) 
		if (pipe_ctx != NULL) {

			hubp = pipe_ctx->plane_res.hubp;

			/*DCHUBP_CNTL:HUBP_DISABLE=0*/

			if (hubp != NULL)

			if (hubp != NULL && hubp->funcs->hubp_disable_control)

				hubp->funcs->hubp_disable_control(hubp, true);

		}

	}
@@ -848,7 +848,7 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) 
		if (pipe_ctx != NULL) {

			hubp = pipe_ctx->plane_res.hubp;

			/*DCHUBP_CNTL:HUBP_BLANK_EN=0*/

			if (hubp != NULL)

			if (hubp != NULL && hubp->funcs->set_hubp_blank_en)

				hubp->funcs->set_hubp_blank_en(hubp, true);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE