diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2004-11-27 22:55:31 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2004-11-27 22:55:31 +0000 |
| commit | 4f8fa6028631fa1d799e9a68ed710fbc98976656 (patch) | |
| tree | df753d0e728afd97ac03388283df51f4e73a9e0d /shared-core/via_irq.c | |
| parent | f0a86288fa4d7b951f33f7b1a6ef36106c7df788 (diff) | |
Reworked PCI MMIO command buffer parser, and imported code from the Mesa
driver. It can now handle the 3D OpenGL commands from the Mesa
unichrome driver.
Added vsync frequency detection support. This will be used in the future
for XvMC and better frame timing.
Bumped minor version number and driver date.
Diffstat (limited to 'shared-core/via_irq.c')
| -rw-r--r-- | shared-core/via_irq.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/shared-core/via_irq.c b/shared-core/via_irq.c index 3d54edc2..2d78dd44 100644 --- a/shared-core/via_irq.c +++ b/shared-core/via_irq.c @@ -45,16 +45,39 @@ #define VIA_IRQ_VBI_ENABLE (1 << 19) #define VIA_IRQ_VBI_PENDING (1 << 3) + + +static unsigned time_diff(struct timeval *now,struct timeval *then) +{ + return (now->tv_usec >= then->tv_usec) ? + now->tv_usec - then->tv_usec : + 1000000 - (then->tv_usec - now->tv_usec); +} + irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) { drm_device_t *dev = (drm_device_t *) arg; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; u32 status; int handled = 0; + struct timeval cur_vblank; status = VIA_READ(VIA_REG_INTERRUPT); if (status & VIA_IRQ_VBI_PENDING) { atomic_inc(&dev->vbl_received); + if (!(atomic_read(&dev->vbl_received) & 0x0F)) { + do_gettimeofday(&cur_vblank); + if (dev_priv->last_vblank_valid) { + dev_priv->usec_per_vblank = + time_diff( &cur_vblank,&dev_priv->last_vblank) >> 4; + } + dev_priv->last_vblank = cur_vblank; + dev_priv->last_vblank_valid = 1; + } + if (!(atomic_read(&dev->vbl_received) & 0xFF)) { + DRM_DEBUG("US per vblank is: %u\n", + dev_priv->usec_per_vblank); + } DRM_WAKEUP(&dev->vbl_queue); drm_vbl_send_signals(dev); handled = 1; @@ -116,6 +139,7 @@ void via_driver_irq_preinstall(drm_device_t * dev) DRM_DEBUG("driver_irq_preinstall: dev_priv: %p\n", dev_priv); if (dev_priv) { + dev_priv->last_vblank_valid = 0; DRM_DEBUG("mmio: %p\n", dev_priv->mmio); status = VIA_READ(VIA_REG_INTERRUPT); DRM_DEBUG("intreg: %x\n", status & VIA_IRQ_VBI_ENABLE); @@ -163,3 +187,4 @@ void via_driver_irq_uninstall(drm_device_t * dev) VIA_WRITE(VIA_REG_INTERRUPT, status & ~VIA_IRQ_VBI_ENABLE); } } + |