summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-07 12:31:17 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-07 14:35:53 +0200
commit209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d (patch)
treec9722b8253e9cd427c7d919280416111c3b5048f /include
parent047fe6e6db9161e69271f56daaafdaf2add023b1 (diff)
downloadlinux-stable-209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d.tar.gz
linux-stable-209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d.tar.bz2
linux-stable-209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d.zip
drm/vblank: Use u32 consistently for vblank counters
In commit 99264a61dfcda41d86d0960cf2d4c0fc2758a773 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed Apr 15 19:34:43 2015 +0200 drm/vblank: Fixup and document timestamp update/read barriers I've switched vblank->count from atomic_t to unsigned long and accidentally created an integer comparison bug in drm_vblank_count_and_time since vblanke->count might overflow the u32 local copy and hence the retry loop never succeed. Fix this by consistently using u32. Cc: Michel Dänzer <michel@daenzer.net> Reported-by: Michel Dänzer <michel@daenzer.net> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drmP.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 48db6a56975f..5aa519711e0b 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -691,7 +691,7 @@ struct drm_vblank_crtc {
struct timer_list disable_timer; /* delayed disable timer */
/* vblank counter, protected by dev->vblank_time_lock for writes */
- unsigned long count;
+ u32 count;
/* vblank timestamps, protected by dev->vblank_time_lock for writes */
struct timeval time[DRM_VBLANKTIME_RBSIZE];