Merge "drm/msm/sde: disable power only after reading the line count" (affa66f8) · Commits · e / devices / android_kernel_fairphone_FP3

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -3232,18 +3232,20 @@ static void sde_encoder_vsync_event_work_handler(struct kthread_work *work)
		sde_enc->cur_master->ops.is_autorefresh_enabled(
		sde_enc->cur_master);

		_sde_encoder_power_enable(sde_enc, false);

		/* Update timer if autorefresh is enabled else return */
		if (!autorefresh_enabled)
		return;
		goto exit;

		if (_sde_encoder_wakeup_time(&sde_enc->base, &wakeup_time))
		return;
		rc = _sde_encoder_wakeup_time(&sde_enc->base, &wakeup_time);
		if (rc)
		goto exit;

		SDE_EVT32_VERBOSE(ktime_to_ms(wakeup_time));
		mod_timer(&sde_enc->vsync_event_timer,
		nsecs_to_jiffies(ktime_to_ns(wakeup_time)));

		exit:
		_sde_encoder_power_enable(sde_enc, false);
		}

		int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc,