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

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

Merge "drm/msm/sde: stage border fill on both layermixers in WB disable"

parents fd6556a1 a7b8a297

drivers/gpu/drm/msm/sde/sde_encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3277,7 +3277,7 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc, 


	if (wb_enc) {

		if (sde_encoder_helper_reset_mixers(phys_enc,

				wb_enc->fb_disable))

				NULL))

			return;



		if (wb_enc->hw_wb->ops.bind_pingpong_blk) {

drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c

+1 −1
Original line number Diff line number Diff line
@@ -1569,7 +1569,7 @@ static void sde_encoder_phys_wb_disable(struct sde_encoder_phys *phys_enc) 
		goto exit;

	}



	if (sde_encoder_helper_reset_mixers(phys_enc, wb_enc->fb_disable))

	if (sde_encoder_helper_reset_mixers(phys_enc, NULL))

		goto exit;



	phys_enc->enable_state = SDE_ENC_DISABLING;