Merge "msm: sde: avoid redundant signal/release on finished request" into msm-4.9 (da1c0972) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+20 −18

Original line number	Diff line number	Diff line
		@@ -1924,10 +1924,11 @@ static void sde_rotator_cancel_request(struct sde_rot_mgr *mgr,
		struct sde_rot_entry *entry;
		int i;

		if (atomic_read(&req->pending_count)) {
		/*
		* To avoid signal the rotation entry output fence in the wrong
		* order, all the entries in the same request needs to be canceled
		* first, before signaling the output fence.
		* order, all the entries in the same request needs to be
		* canceled first, before signaling the output fence.
		*/
		SDEROT_DBG("cancel work start\n");
		sde_rot_mgr_unlock(mgr);
		@@ -1943,6 +1944,7 @@ static void sde_rotator_cancel_request(struct sde_rot_mgr *mgr,
		sde_rotator_signal_output(entry);
		sde_rotator_release_entry(mgr, entry);
		}
		}

		list_del_init(&req->list);
		devm_kfree(&mgr->pdev->dev, req);