diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-10 20:23:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-10 20:23:21 -0700 |
| commit | a7df849c67f0a5248693e432d03f738e84d6826c (patch) | |
| tree | dbb53fca04da00b7b1e9a27499cce29d69032429 | |
| parent | 90abb7b5f3bd9271a455cd640a70c285b4fd0c89 (diff) | |
| parent | 74e8ebc55d85ca1acb3e73610965bea63cc39054 (diff) | |
| download | blackbird-op-linux-a7df849c67f0a5248693e432d03f738e84d6826c.tar.gz blackbird-op-linux-a7df849c67f0a5248693e432d03f738e84d6826c.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| -rw-r--r-- | drivers/char/drm/drm_pciids.h | 1 | ||||
| -rw-r--r-- | drivers/char/drm/radeon_irq.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h index 54a2914e3a32..11c6950158b3 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/drivers/char/drm/drm_pciids.h @@ -220,5 +220,6 @@ {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x2582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ + {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0, 0, 0} diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c index 5b18bee6492e..cd25f28e26a3 100644 --- a/drivers/char/drm/radeon_irq.c +++ b/drivers/char/drm/radeon_irq.c @@ -123,11 +123,6 @@ static int radeon_wait_irq(drm_device_t *dev, int swi_nr) dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE; - /* This is a hack to work around mysterious freezes on certain - * systems: - */ - radeon_acknowledge_irqs( dev_priv ); - DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ, RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr ); |
