Merge "drm/msm/sde: cancel vsync event timer on encoder stop" (8c42d38d) · Commits · e / devices / android_kernel_fairphone_FP3

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1883,8 +1883,9 @@ static int sde_encoder_resource_control(struct drm_encoder *drm_enc,
		break;

		case SDE_ENC_RC_EVENT_STOP:
		/* cancel vsync event work */
		/* cancel vsync event work and timer */
		kthread_cancel_work_sync(&sde_enc->vsync_event_work);
		del_timer_sync(&sde_enc->vsync_event_timer);

		mutex_lock(&sde_enc->rc_lock);
		/* return if the resource control is already in OFF state */