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

Commit 63681dd7 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: Prevent multiple unblank event trigger" into dev/msm-4.14-display

parents 0a21430c e701a79b

drivers/gpu/drm/msm/msm_atomic.c

+12 −6
Original line number Diff line number Diff line
@@ -465,12 +465,15 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n",

				 encoder->base.id, encoder->name);



		if (connector->state->crtc->state->active_changed) {

			blank = MSM_DRM_BLANK_UNBLANK;

			notifier_data.data = ␣

			notifier_data.id =

			new_conn_state->crtc->index;

				connector->state->crtc->index;

			DRM_DEBUG_ATOMIC("Notify early unblank\n");

			msm_drm_notifier_call_chain(MSM_DRM_EARLY_EVENT_BLANK,

					    &notifier_data);

		}

		/*

		 * Each encoder has at most one connector (since we always steal

		 * it away), so we won't call enable hooks twice.
@@ -519,9 +522,12 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
				 encoder->base.id, encoder->name);



		drm_bridge_enable(encoder->bridge);

		if (connector->state->crtc->state->active_changed) {

			DRM_DEBUG_ATOMIC("Notify unblank\n");

			msm_drm_notifier_call_chain(MSM_DRM_EVENT_BLANK,

					    &notifier_data);

		}

	}

	SDE_ATRACE_END("msm_enable");

}