drm: Peek at the current counter/timestamp for vblank queries
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 17 Mar 2017 20:20:30 +0000 (20:20 +0000)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 29 Mar 2017 11:02:22 +0000 (14:02 +0300)
Bypass all the spinlocks and return the last timestamp and counter from
the last vblank if the driver delcares that it is accurate (and stable
across on/off), and the vblank is currently enabled.

This is dependent upon the both the hardware and driver to provide the
proper barriers to facilitate reading our bookkeeping outside of the
vblank interrupt and outside of the explicit vblank locks.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Michel Dänzer <michel@daenzer.net>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Dave Airlie <airlied@redhat.com>,
Cc: Mario Kleiner <mario.kleiner.de@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317202030.24410-4-chris@chris-wilson.co.uk
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
drivers/gpu/drm/drm_irq.c

index 124402270568af685908f2fbf7dbf8721a5890d7..aa23b9833588843bc0a1d96448ddcaf5937ca35b 100644 (file)
@@ -1561,6 +1561,17 @@ err_put:
        return ret;
 }
 
+static bool drm_wait_vblank_is_query(union drm_wait_vblank *vblwait)
+{
+       if (vblwait->request.sequence)
+               return false;
+
+       return _DRM_VBLANK_RELATIVE ==
+               (vblwait->request.type & (_DRM_VBLANK_TYPES_MASK |
+                                         _DRM_VBLANK_EVENT |
+                                         _DRM_VBLANK_NEXTONMISS));
+}
+
 /*
  * Wait for VBLANK.
  *
@@ -1610,6 +1621,21 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 
        vblank = &dev->vblank[pipe];
 
+       /* If the counter is currently enabled and accurate, short-circuit
+        * queries to return the cached timestamp of the last vblank.
+        */
+       if (dev->vblank_disable_immediate &&
+           drm_wait_vblank_is_query(vblwait) &&
+           READ_ONCE(vblank->enabled)) {
+               struct timeval now;
+
+               vblwait->reply.sequence =
+                       drm_vblank_count_and_time(dev, pipe, &now);
+               vblwait->reply.tval_sec = now.tv_sec;
+               vblwait->reply.tval_usec = now.tv_usec;
+               return 0;
+       }
+
        ret = drm_vblank_get(dev, pipe);
        if (ret) {
                DRM_DEBUG("crtc %d failed to acquire vblank counter, %d\n", pipe, ret);