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

Commit 04b45a66 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: handle pm_resume commit correctly" into dev/msm-4.14-display

parents 8fb21789 21d8ba6a

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

+2 −1
Original line number Diff line number Diff line
@@ -2607,7 +2607,8 @@ static int sde_kms_pm_resume(struct device *dev) 
	if (sde_kms->suspend_state) {

		sde_kms->suspend_state->acquire_ctx = &ctx;

		for (i = 0; i < TEARDOWN_DEADLOCK_RETRY_MAX; i++) {

			ret = drm_atomic_commit(sde_kms->suspend_state);

			ret = drm_atomic_helper_commit_duplicated_state(

					sde_kms->suspend_state, &ctx);

			if (ret != -EDEADLK)

				break;