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

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

Merge "drm/msm: Trigger unblank event during bootup"

parents f65530a9 211dc35f

drivers/gpu/drm/msm/msm_atomic.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -415,6 +415,7 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
	struct msm_kms *kms = priv->kms;

	struct msm_kms *kms = priv->kms;

	int bridge_enable_count = 0;

	int bridge_enable_count = 0;

	int i, blank;

	int i, blank;

	bool splash = false;





	SDE_ATRACE_BEGIN("msm_enable");

	SDE_ATRACE_BEGIN("msm_enable");

	for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state,

	for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state,
@@ -474,8 +475,11 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n",

		DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n",

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

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





		if (connector->state->crtc &&

		if (kms && kms->funcs && kms->funcs->check_for_splash)

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

			splash = kms->funcs->check_for_splash(kms);



		if (splash || (connector->state->crtc &&

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

			blank = MSM_DRM_BLANK_UNBLANK;

			blank = MSM_DRM_BLANK_UNBLANK;

			notifier_data.data = ␣

			notifier_data.data = ␣

			notifier_data.id =

			notifier_data.id =
@@ -532,8 +536,9 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
				 encoder->base.id, encoder->name);

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





		drm_bridge_enable(encoder->bridge);

		drm_bridge_enable(encoder->bridge);

		if (connector->state->crtc &&



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

		if (splash || (connector->state->crtc &&

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

			DRM_DEBUG_ATOMIC("Notify unblank\n");

			DRM_DEBUG_ATOMIC("Notify unblank\n");

			msm_drm_notifier_call_chain(MSM_DRM_EVENT_BLANK,

			msm_drm_notifier_call_chain(MSM_DRM_EVENT_BLANK,

					    &notifier_data);

					    &notifier_data);