]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/vblank: Tune drm_crtc_accurate_vblank_count() WARN down to a debug
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 23 Oct 2017 15:25:40 +0000 (18:25 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 7 Nov 2017 19:07:02 +0000 (21:07 +0200)
Since commit 632c6e4edef1 ("drm/vblank: Fix flip event vblank count")
even drivers that don't implement accurate vblank timestamps will end
up using drm_crtc_accurate_vblank_count(). That leads to a WARN every
time drm_crtc_arm_vblank_event() gets called. The could be as often
as every frame for each active crtc.

Considering drm_crtc_accurate_vblank_count() is never any worse than
the drm_vblank_count() we used previously, let's just skip the WARN
unless DRM_UT_VBL is enabled. That way people won't be bothered by
this unless they're debugging vblank code. And let's also change it
to WARN_ONCE() so that even when you're debugging vblank code you
won't get drowned by constant WARNs.

Cc: stable@vger.kernel.org
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: "Szyprowski, Marek" <m.szyprowski@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Reported-by: Andrzej Hajda <a.hajda@samsung.com>
Fixes: 632c6e4edef1 ("drm/vblank: Fix flip event vblank count")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171023152540.15364-1-ville.syrjala@linux.intel.com
Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_vblank.c

index 57cc6e37c81083fe9c7727ce851d6119692399a9..09c1c4ff93ca4c00948b3104970a628b81a06893 100644 (file)
@@ -299,8 +299,8 @@ u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
        u32 vblank;
        unsigned long flags;
 
-       WARN(!dev->driver->get_vblank_timestamp,
-            "This function requires support for accurate vblank timestamps.");
+       WARN_ONCE(drm_debug & DRM_UT_VBL && !dev->driver->get_vblank_timestamp,
+                 "This function requires support for accurate vblank timestamps.");
 
        spin_lock_irqsave(&dev->vblank_time_lock, flags);