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

Commit c92b80a4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: reset both Layer mixers during Writeback disable"

parents 3acb9948 597ab699

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

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1349,7 +1349,7 @@ static void sde_encoder_phys_wb_disable(struct sde_encoder_phys *phys_enc) 
	/* reset h/w before final flush */

	if (phys_enc->hw_ctl->ops.clear_pending_flush)

		phys_enc->hw_ctl->ops.clear_pending_flush(phys_enc->hw_ctl);

	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;