Commit 45e97ab6 authored Jun 15, 2011 by Wolfram Sang Committed by Dave Airlie Jun 16, 2011

drm: populate irq_by_busid-member for pci



Commit 8410ea (drm: rework PCI/platform driver interface) implemented
drm_pci_irq_by_busid() but forgot to make it available in the
drm_pci_bus-struct.

This caused a freeze on my Radeon9600-equipped laptop when executing glxgears.
Thanks to Michel for noticing the flaw.

[airlied: made function static also]

Reported-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 21c5977a

drivers/gpu/drm/drm_pci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@ err:
		}


		int drm_pci_irq_by_busid(struct drm_device dev, struct drm_irq_busid p)
		static int drm_pci_irq_by_busid(struct drm_device dev, struct drm_irq_busid p)
		{
		if ((p->busnum >> 8) != drm_get_pci_domain(dev) \|\|
		(p->busnum & 0xff) != dev->pdev->bus->number \|\|
		@@ -292,6 +292,7 @@ static struct drm_bus drm_pci_bus = {
		.get_name = drm_pci_get_name,
		.set_busid = drm_pci_set_busid,
		.set_unique = drm_pci_set_unique,
		.irq_by_busid = drm_pci_irq_by_busid,
		.agp_init = drm_pci_agp_init,
		};

Admin message