Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

a7df849c · Linus Torvalds · 90abb7b5 · 74e8ebc5 · a7df849c · a7df849c
Commit a7df849c authored 19 years ago by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

drivers/char/drm/drm_pciids.h drivers/char/drm/drm_pciids.h +1 -0

drivers/char/drm/radeon_irq.c drivers/char/drm/radeon_irq.c +0 -5

No files found.
--- 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}

--- 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 );