diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-22 11:12:02 -0700 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-22 11:12:02 -0700 |
| commit | 7f2a1cf2753c0c97b1290469a15322f7549f78ae (patch) | |
| tree | 1375351c4dbe31e2c6b4703bcb685f89b7fb2c46 /linux-core/drmP.h | |
| parent | d2d53024fb4003a6b86a3ea1ea33c76ac20bebc9 (diff) | |
| parent | 97dcd7fd25c18d5148619254229f8d94efb55b44 (diff) | |
Merge branch 'vblank-rework' into vblank
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index cf1c0fd7..0ab69feb 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -832,6 +832,7 @@ typedef struct drm_device { /* for wraparound handling */ u32 *vblank_offset; /* used to track how many vblanks */ u32 *vblank_premodeset; /* were lost during modeset */ + struct timer_list vblank_disable_timer; unsigned long max_vblank_count; /**< size of vblank counter register */ spinlock_t tasklet_lock; /**< For drm_locked_tasklet */ |