diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-12 13:35:41 -0700 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-12 13:35:41 -0700 |
| commit | ca47fa90b73d0eac73fb7d1ba712d81e180eae7d (patch) | |
| tree | 586ab4ad1306c572405617f56f7aaabb0e79116f /shared-core/i915_drv.h | |
| parent | db689c7b95613237cec904c3f6ee27e8c2bf7ce0 (diff) | |
Update vblank code:
- move pre/post modeset ioctl to core
- fixup i915 buffer swap
- fix outstanding signal count code
- create new core vblank init routine
- test (works with glxgears)
- simplify i915 interrupt handler
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 88949ad0..079e9017 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -132,8 +132,6 @@ typedef struct drm_i915_private { spinlock_t swaps_lock; drm_i915_vbl_swap_t vbl_swaps; unsigned int swaps_pending; - unsigned long vblank_offset[2]; - unsigned long vblank_premodeset[2]; } drm_i915_private_t; enum intel_chip_family { @@ -165,7 +163,7 @@ extern int i915_irq_wait(DRM_IOCTL_ARGS); extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); extern void i915_driver_irq_preinstall(drm_device_t * dev); -extern void i915_driver_irq_postinstall(drm_device_t * dev); +extern int i915_driver_irq_postinstall(drm_device_t * dev); extern void i915_driver_irq_uninstall(drm_device_t * dev); extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS); extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS); @@ -176,8 +174,6 @@ extern int i915_vblank_swap(DRM_IOCTL_ARGS); extern void i915_enable_vblank(drm_device_t *dev, int crtc); extern void i915_disable_vblank(drm_device_t *dev, int crtc); extern u32 i915_get_vblank_counter(drm_device_t *dev, int crtc); -extern void i915_premodeset(drm_device_t *dev, int crtc); -extern void i915_postmodeset(drm_device_t *dev, int crtc); /* i915_mem.c */ extern int i915_mem_alloc(DRM_IOCTL_ARGS); |