From 6af277472cb5d7b80d001cdf2e284ec06c16f0a8 Mon Sep 17 00:00:00 2001 From: Manoj Kumar AVM Date: Tue, 21 May 2019 18:33:46 -0700 Subject: [PATCH] Revert "disp: msm: sde: turn off/on vblank callbacks as per crtc" This reverts commit 16bfab7ddfd05b5c48f817d8bc8ec47775301cee. Change-Id: I5c5ef6a2fcb83607acd2c737f574199c010c89fa Signed-off-by: Manoj Kumar AVM --- msm/msm_drv.c | 4 ---- msm/sde/sde_crtc.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/msm/msm_drv.c b/msm/msm_drv.c index 7055cca7f567..9ac98f0551da 100644 --- a/msm/msm_drv.c +++ b/msm/msm_drv.c @@ -699,7 +699,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) struct msm_kms *kms = NULL; int ret; struct sched_param param = { 0 }; - struct drm_crtc *crtc; ddev = drm_dev_alloc(drv, dev); if (!ddev) { @@ -771,9 +770,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) goto fail; } - drm_for_each_crtc(crtc, ddev) - drm_crtc_vblank_reset(crtc); - if (kms) { pm_runtime_get_sync(dev); ret = drm_irq_install(ddev, platform_get_irq(pdev, 0)); diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 8d2cc21a3cf4..a99592bfd0a9 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -3813,7 +3813,6 @@ static void sde_crtc_reset(struct drm_crtc *crtc) cstate->base.crtc = crtc; crtc->state = &cstate->base; - drm_crtc_vblank_reset(crtc); } static void sde_crtc_handle_power_event(u32 event_type, void *arg) @@ -3974,8 +3973,6 @@ static void sde_crtc_disable(struct drm_crtc *crtc) SDE_DEBUG("crtc%d\n", crtc->base.id); - drm_crtc_vblank_off(crtc); - if (sde_kms_is_suspend_state(crtc->dev)) _sde_crtc_set_suspend(crtc, true); @@ -4114,8 +4111,6 @@ static void sde_crtc_enable(struct drm_crtc *crtc, SDE_EVT32_VERBOSE(DRMID(crtc)); sde_crtc = to_sde_crtc(crtc); - drm_crtc_vblank_on(crtc); - mutex_lock(&sde_crtc->crtc_lock); SDE_EVT32(DRMID(crtc), sde_crtc->enabled, sde_crtc->suspend, sde_crtc->vblank_requested);