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

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

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

parents 0030c38b 3f11baf5

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");