diff options
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 59c796b46ee7..d5e8e5c89548 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -861,8 +861,6 @@ struct drm_device { | |||
861 | struct timer_list vblank_disable_timer; | 861 | struct timer_list vblank_disable_timer; |
862 | 862 | ||
863 | u32 max_vblank_count; /**< size of vblank counter register */ | 863 | u32 max_vblank_count; /**< size of vblank counter register */ |
864 | spinlock_t tasklet_lock; /**< For drm_locked_tasklet */ | ||
865 | void (*locked_tasklet_func)(struct drm_device *dev); | ||
866 | 864 | ||
867 | /*@} */ | 865 | /*@} */ |
868 | cycles_t ctx_start; | 866 | cycles_t ctx_start; |
@@ -1149,16 +1147,14 @@ extern int drm_vblank_init(struct drm_device *dev, int num_crtcs); | |||
1149 | extern int drm_wait_vblank(struct drm_device *dev, void *data, | 1147 | extern int drm_wait_vblank(struct drm_device *dev, void *data, |
1150 | struct drm_file *filp); | 1148 | struct drm_file *filp); |
1151 | extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq); | 1149 | extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq); |
1152 | extern void drm_locked_tasklet(struct drm_device *dev, | ||
1153 | void(*func)(struct drm_device *)); | ||
1154 | extern u32 drm_vblank_count(struct drm_device *dev, int crtc); | 1150 | extern u32 drm_vblank_count(struct drm_device *dev, int crtc); |
1155 | extern void drm_handle_vblank(struct drm_device *dev, int crtc); | 1151 | extern void drm_handle_vblank(struct drm_device *dev, int crtc); |
1156 | extern int drm_vblank_get(struct drm_device *dev, int crtc); | 1152 | extern int drm_vblank_get(struct drm_device *dev, int crtc); |
1157 | extern void drm_vblank_put(struct drm_device *dev, int crtc); | 1153 | extern void drm_vblank_put(struct drm_device *dev, int crtc); |
1154 | extern void drm_vblank_cleanup(struct drm_device *dev); | ||
1158 | /* Modesetting support */ | 1155 | /* Modesetting support */ |
1159 | extern int drm_modeset_ctl(struct drm_device *dev, void *data, | 1156 | extern int drm_modeset_ctl(struct drm_device *dev, void *data, |
1160 | struct drm_file *file_priv); | 1157 | struct drm_file *file_priv); |
1161 | extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*)); | ||
1162 | 1158 | ||
1163 | /* AGP/GART support (drm_agpsupport.h) */ | 1159 | /* AGP/GART support (drm_agpsupport.h) */ |
1164 | extern struct drm_agp_head *drm_agp_init(struct drm_device *dev); | 1160 | extern struct drm_agp_head *drm_agp_init(struct drm_device *dev); |