Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684AbaJKSf1 (ORCPT ); Sat, 11 Oct 2014 14:35:27 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:42345 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751582AbaJKSfZ (ORCPT ); Sat, 11 Oct 2014 14:35:25 -0400 Date: Sat, 11 Oct 2014 20:35:25 +0200 From: Daniel Vetter To: Andrzej Hajda Cc: Inki Dae , "moderated list:ARM/S5P EXYNOS AR..." , Seung-Woo Kim , open list , dri-devel@lists.freedesktop.org, Kyungmin Park , Marek Szyprowski Subject: Re: [PATCH 3/4] drm/exynos: enable vblank after DPMS on Message-ID: <20141011183525.GF26941@phenom.ffwll.local> Mail-Followup-To: Andrzej Hajda , Inki Dae , "moderated list:ARM/S5P EXYNOS AR..." , Seung-Woo Kim , open list , dri-devel@lists.freedesktop.org, Kyungmin Park , Marek Szyprowski References: <1412944316-27737-1-git-send-email-a.hajda@samsung.com> <1412944316-27737-4-git-send-email-a.hajda@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1412944316-27737-4-git-send-email-a.hajda@samsung.com> X-Operating-System: Linux phenom 3.16-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 10, 2014 at 02:31:55PM +0200, Andrzej Hajda wrote: > Before DPMS off driver disables vblank. > It should be balanced by vblank enable after DPMS on. > The patch fixes issue with page_flip ioctl not being able > to acquire vblank counter introduced by patch: > drm: Always reject drm_vblank_get() after drm_vblank_off() > > Signed-off-by: Andrzej Hajda Yeah, you should always call vblank_on again when you (re)enable a crtc, whether this is through a set_config call or through dpms. This is Reviewed-by: Daniel Vetter Sorry that we didn't catch the impact of this additional check on existing drivers, I've thought I've reviewed them and checked that they all call vblank_on. But I didn't take into account that the codepaths might differ for dpms and set_config paths. Otoh most drivers really should implement one in terms of the other. Cheers, Daniel > --- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > index 8e38e9f..45026e6 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > @@ -71,13 +71,16 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) > !atomic_read(&exynos_crtc->pending_flip), > HZ/20)) > atomic_set(&exynos_crtc->pending_flip, 0); > - drm_vblank_off(crtc->dev, exynos_crtc->pipe); > + drm_crtc_vblank_off(crtc); > } > > if (manager->ops->dpms) > manager->ops->dpms(manager, mode); > > exynos_crtc->dpms = mode; > + > + if (mode == DRM_MODE_DPMS_ON) > + drm_crtc_vblank_on(crtc); > } > > static void exynos_drm_crtc_prepare(struct drm_crtc *crtc) > -- > 1.9.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/