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

Commit 94943474 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: ensure rsc in vid state at writeback null commit" into dev/msm-4.14-display

parents ed128c7b 425fee42
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -3268,6 +3268,17 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
				phys->ops.disable(phys);
		}
	} else {

		if ((intf_mode == INTF_MODE_WB_BLOCK ||
			intf_mode == INTF_MODE_WB_LINE)
			&& sde_enc->crtc && sde_enc->crtc->state &&
			sde_enc->crtc->state->enable &&
			sde_enc->crtc->state->mode_changed) {
			sde_encoder_resource_control(drm_enc,
				SDE_ENC_RC_EVENT_KICKOFF);
			SDE_EVT32(intf_mode, sde_enc->crtc->state->enable);
		}

		for (i = 0; i < sde_enc->num_phys_encs; i++) {
			struct sde_encoder_phys *phys = sde_enc->phys_encs[i];