Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Linus Torvalds 20 years ago
parent
90abb7b5f3 74e8ebc55d
commit
a7df849c67
2 changed files with 1 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 0
      drivers/char/drm/drm_pciids.h
  2. 0 5
      drivers/char/drm/radeon_irq.c

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

@@ -220,5 +220,6 @@
 
 	{0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 
 	{0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 
 	{0x8086, 0x2582, 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, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 
+	{0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 
 	{0, 0, 0}
 
 	{0, 0, 0}

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

@@ -123,11 +123,6 @@ static int radeon_wait_irq(drm_device_t *dev, int swi_nr)
 
 
 
 	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
 
 	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, 
 	DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ, 
 		     RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
 
 		     RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );