Re: [GIT PATCH] drm fixes needed before 2.6.12 gets released..

[Dave Airlie <airlied@linux.ie>]

>
> I've created a tree with two patches, one is a new PCI ID for i945G
> chipset, the other fixes a bug in the IRQ handler for Radeon (a more
> complete fix is worked out but this is the most I'm willing to commit
> without more testing...
>
> Please pull from:
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
>
> I'll reply to this mail with the patch for completeness.
>

diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
--- 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
--- 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_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 );

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/