OSDN Git Service

drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
authorMario Kleiner <mario.kleiner.de@gmail.com>
Tue, 7 Apr 2015 04:31:09 +0000 (06:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2015 16:55:08 +0000 (09:55 -0700)
commitfcfb5aa246c80df8b0a2ccadd7284b4c189149b0
tree8697f7035ca4c5c4685ef72636a5be7f9d87fe7a
parenta314c7d8d9ca0af1d86cf01ebfe102f300cf6fa5
drm: Zero out invalid vblank timestamp in drm_update_vblank_count.

commit fdb68e09bbb1c981f24608d7022c7d93cc47b326 upstream.

Since commit 844b03f27739135fe1fed2fef06da0ffc4c7a081 we make
sure that after vblank irq off, we return the last valid
(vblank count, vblank timestamp) pair to clients, e.g., during
modesets, which is good.

An overlooked side effect of that commit for kms drivers without
support for precise vblank timestamping is that at vblank irq
enable, when we update the vblank counter from the hw counter, we
can't update the corresponding vblank timestamp, so now we have a
totally mismatched timestamp for the new count to confuse clients.

Restore old client visible behaviour from before Linux 3.17, but
zero out the timestamp at vblank counter update (instead of disable
as in original implementation) if we can't generate a meaningful
timestamp immediately for the new vblank counter. This will fix
this regression, so callers know they need to retry again later
if they need a valid timestamp, but at the same time preserves
the improvements made in the commit mentioned above.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: <stable@vger.kernel.org> #v3.17+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_irq.c