Merge "drm/msm/sde: signal pageflip event after frame kickoff" into dev/msm-4.14-display (f6ea99ce) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+28 −43

Original line number	Diff line number	Diff line
		@@ -2205,7 +2205,7 @@ void sde_crtc_prepare_commit(struct drm_crtc *crtc,
		}

		/**
		* _sde_crtc_complete_flip - signal pending page_flip events
		* sde_crtc_complete_flip - signal pending page_flip events
		* Any pending vblank events are added to the vblank_event_list
		* so that the next vblank interrupt shall signal them.
		* However PAGE_FLIP events are not handled through the vblank_event_list.
		@@ -2215,7 +2215,7 @@ void sde_crtc_prepare_commit(struct drm_crtc *crtc,
		* @crtc: Pointer to drm crtc structure
		* @file: Pointer to drm file
		*/
		static void _sde_crtc_complete_flip(struct drm_crtc *crtc,
		void sde_crtc_complete_flip(struct drm_crtc *crtc,
		struct drm_file *file)
		{
		struct sde_crtc *sde_crtc = to_sde_crtc(crtc);
		@@ -2225,8 +2225,11 @@ static void _sde_crtc_complete_flip(struct drm_crtc *crtc,

		spin_lock_irqsave(&dev->event_lock, flags);
		event = sde_crtc->event;
		if (event) {
		/* if regular vblank case (!file) or if cancel-flip from
		if (!event)
		goto end;

		/*
		* if regular vblank case (!file) or if cancel-flip from
		* preclose on file that requested flip, then send the
		* event:
		*/
		@@ -2237,7 +2240,8 @@ static void _sde_crtc_complete_flip(struct drm_crtc *crtc,
		SDE_EVT32_VERBOSE(DRMID(crtc));
		drm_crtc_send_vblank_event(crtc, event);
		}
		}

		end:
		spin_unlock_irqrestore(&dev->event_lock, flags);
		}

		@@ -2278,7 +2282,6 @@ static void sde_crtc_vblank_cb(void *data)
		sde_crtc->vblank_last_cb_time = ktime_get();
		sysfs_notify_dirent(sde_crtc->vsync_event_sf);

		_sde_crtc_complete_flip(crtc, NULL);
		drm_crtc_handle_vblank(crtc);
		DRM_DEBUG_VBL("crtc%d\n", crtc->base.id);
		SDE_EVT32_VERBOSE(DRMID(crtc));
		@@ -3028,7 +3031,6 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc,
		struct sde_crtc *sde_crtc;
		struct drm_encoder *encoder;
		struct drm_device *dev;
		unsigned long flags;
		struct sde_kms *sde_kms;

		if (!crtc) {
		@@ -3062,14 +3064,6 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc,
		_sde_crtc_setup_lm_bounds(crtc, crtc->state);
		}

		if (sde_crtc->event) {
		WARN_ON(sde_crtc->event);
		} else {
		spin_lock_irqsave(&dev->event_lock, flags);
		sde_crtc->event = crtc->state->event;
		spin_unlock_irqrestore(&dev->event_lock, flags);
		}

		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
		if (encoder->crtc != crtc)
		continue;
		@@ -3122,7 +3116,6 @@ static void sde_crtc_atomic_flush(struct drm_crtc *crtc,
		struct drm_plane *plane;
		struct msm_drm_private *priv;
		struct msm_drm_thread *event_thread;
		unsigned long flags;
		struct sde_crtc_state *cstate;
		struct sde_kms *sde_kms;
		int idle_time = 0;
		@@ -3164,14 +3157,6 @@ static void sde_crtc_atomic_flush(struct drm_crtc *crtc,
		event_thread = &priv->event_thread[crtc->index];
		idle_time = sde_crtc_get_property(cstate, CRTC_PROP_IDLE_TIMEOUT);

		if (sde_crtc->event) {
		SDE_DEBUG("already received sde_crtc->event\n");
		} else {
		spin_lock_irqsave(&dev->event_lock, flags);
		sde_crtc->event = crtc->state->event;
		spin_unlock_irqrestore(&dev->event_lock, flags);
		}

		/*
		* If no mixers has been allocated in sde_crtc_atomic_check(),
		* it means we are trying to flush a CRTC whose state is disabled:
		@@ -3612,6 +3597,7 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
		struct sde_kms *sde_kms;
		struct sde_crtc_state *cstate;
		bool is_error, reset_req, recovery_events;
		unsigned long flags;

		if (!crtc) {
		SDE_ERROR("invalid argument\n");
		@@ -3712,6 +3698,15 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
		sde_encoder_kickoff(encoder, false);
		}

		/* store the event after frame trigger */
		if (sde_crtc->event) {
		WARN_ON(sde_crtc->event);
		} else {
		spin_lock_irqsave(&dev->event_lock, flags);
		sde_crtc->event = crtc->state->event;
		spin_unlock_irqrestore(&dev->event_lock, flags);
		}

		SDE_ATRACE_END("crtc_commit");
		}

		@@ -4882,16 +4877,6 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
		return 0;
		}

		void sde_crtc_cancel_pending_flip(struct drm_crtc crtc, struct drm_file file)
		{
		struct sde_crtc *sde_crtc = to_sde_crtc(crtc);

		SDE_DEBUG("%s: cancel: %pK\n", sde_crtc->name, file);
		_sde_crtc_complete_flip(crtc, file);
		}



		/**
		* sde_crtc_install_properties - install all drm properties for crtc
		* @crtc: Pointer to drm crtc structure

drivers/gpu/drm/msm/sde/sde_crtc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -546,11 +546,11 @@ struct drm_crtc sde_crtc_init(struct drm_device dev, struct drm_plane *plane);
		int sde_crtc_post_init(struct drm_device dev, struct drm_crtc crtc);

		/**
		* sde_crtc_cancel_pending_flip - complete flip for clients on lastclose
		* sde_crtc_complete_flip - complete flip for clients
		* @crtc: Pointer to drm crtc object
		* @file: client to cancel's file handle
		*/
		void sde_crtc_cancel_pending_flip(struct drm_crtc crtc, struct drm_file file);
		void sde_crtc_complete_flip(struct drm_crtc crtc, struct drm_file file);

		/**
		* sde_crtc_register_custom_event - api for enabling/disabling crtc event

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -1096,6 +1096,8 @@ static void sde_kms_wait_for_commit_done(struct msm_kms *kms,
		SDE_ERROR("wait for commit done returned %d\n", ret);
		break;
		}

		sde_crtc_complete_flip(crtc, NULL);
		}
		}

		@@ -1928,8 +1930,9 @@ static void sde_kms_preclose(struct msm_kms kms, struct drm_file file)
		struct drm_modeset_acquire_ctx ctx;
		int ret = 0;

		/* cancel pending flip event */
		for (i = 0; i < priv->num_crtcs; i++)
		sde_crtc_cancel_pending_flip(priv->crtcs[i], file);
		sde_crtc_complete_flip(priv->crtcs[i], file);

		drm_modeset_acquire_init(&ctx, 0);
		retry: