Commit 3f11baf5 authored Sep 07, 2018 by Samantha Tran

Revert "drm/msm/disp/dpu: fix early dereference of phys encoder"



This reverts commit 77a209cd.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not used in 4.19 downstream display
driver and these changes are made in the common layer which
affects the downstream driver functionalities. Separate patches
are submitted to revert the upstream driver and introduce the
downstream version of the display driver.

Change-Id: Idcdb854395fff490b96cda1b9b4eed375deb9b18
Signed-off-by: Samantha Tran <samtran@codeaurora.org>

parent 5f1b0148

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2444,8 +2444,6 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc,

		for (i = 0; i < dpu_enc->num_phys_encs; i++) {
		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
		if (!phys)
		continue;

		switch (event) {
		case MSM_ENC_COMMIT_DONE:
		@@ -2463,7 +2461,7 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc,
		return -EINVAL;
		};

		if (fn_wait) {
		if (phys && fn_wait) {
		DPU_ATRACE_BEGIN("wait_for_completion_event");
		ret = fn_wait(phys);
		DPU_ATRACE_END("wait_for_completion_event");