Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f54bc0bf authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: fix null check for encoder dsc disable"

parents 2ee5d8ad de27157b

msm/sde/sde_encoder.c

+8 −2
Original line number Diff line number Diff line
@@ -1804,13 +1804,19 @@ static void _sde_encoder_dsc_disable(struct sde_encoder_virt *sde_enc) 
	if (!_sde_encoder_is_dsc_enabled(&sde_enc->base))

		return;



	if (!sde_enc || !sde_enc->phys_encs[0] ||

			!sde_enc->phys_encs[0]->connector) {

	if (!sde_enc || !sde_enc->phys_encs[0]) {

		SDE_ERROR("invalid params %d %d\n",

			!sde_enc, sde_enc ? !sde_enc->phys_encs[0] : -1);

		return;

	}



	/*

	 * Connector can be null if the first virt modeset after suspend

	 * is called with dynamic clock or dms enabled.

	 */

	if (!sde_enc->phys_encs[0]->connector)

		return;



	if (sde_enc->cur_master)

		hw_ctl = sde_enc->cur_master->hw_ctl;