path: root/include/drm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-08 04:18:14 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-08 04:18:14 +0300
commit981dae742bc67ccd078bab0affdfb5eb78fc5697 (patch)
tree1a5cd353ef439920a4a7c15b26541429df99e749 /include/drm
parent49d7c6559bf2ab4f1d56be131ab9571a51fc71bd (diff)
parent209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d (diff)
Merge tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel
Pull drm fixes from Daniel Vetter: "One i915 regression fix and a drm core one since Dave's not around, both introduced in 4.2 so not cc: stable. The fix for the warning Ted reported isn't in here yet since he didn't yet supply a tested-by and I can't repro this one myself (it's in fixup code that needs firmware doing something i915 wouldn't do)" * tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel: drm/vblank: Use u32 consistently for vblank counters drm/i915: Allow parsing of variable size child device entries from VBT
Diffstat (limited to 'include/drm')
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];