summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>2007-06-21 15:26:34 -0700
committerJesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>2007-06-21 15:26:34 -0700
commit24c09faec1c47260cd280221fa72fe18a12efef9 (patch)
treef474889c94ef2dd25b9e712d050f3c933394c9c6
parent2d24455ed8b12df6d06d135cb70f02473d11f4b0 (diff)
parentafe842297f7117cf80718de78ce706f6fd83584b (diff)
Merge branch 'vblank-rework' into vblank
-rw-r--r--shared-core/radeon_irq.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index cf72fc5b..a1b79718 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -37,7 +37,7 @@
static void radeon_irq_set_state(drm_device_t *dev, u32 mask, int state)
{
- drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
+ drm_radeon_private_t *dev_priv = dev->dev_private;
if (state)
dev_priv->irq_enable_reg |= mask;
@@ -84,7 +84,8 @@ void radeon_disable_vblank(drm_device_t *dev, int crtc)
static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv,
u32 mask)
{
- u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) & mask;
+ u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) &
+ (mask | RADEON_CRTC_VBLANK_MASK | RADEON_CRTC2_VBLANK_MASK);
if (irqs)
RADEON_WRITE(RADEON_GEN_INT_STATUS, irqs);
return irqs;