diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-06-15 05:26:47 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-06-16 02:26:45 -0400 |
| commit | 45e97ab65026a3391cb2c938f834ca5db4d2e5b3 (patch) | |
| tree | b6e0e60a16048ae3c0d1d0e0a2843803ed99049b | |
| parent | 21c5977a836e399fc710ff2c5367845ed5c2527f (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/drm_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index e1aee4f6a7c6..b6a19cb07caf 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
| @@ -251,7 +251,7 @@ err: | |||
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | 253 | ||
| 254 | int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) | 254 | static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p) |
| 255 | { | 255 | { |
| 256 | if ((p->busnum >> 8) != drm_get_pci_domain(dev) || | 256 | if ((p->busnum >> 8) != drm_get_pci_domain(dev) || |
| 257 | (p->busnum & 0xff) != dev->pdev->bus->number || | 257 | (p->busnum & 0xff) != dev->pdev->bus->number || |
| @@ -292,6 +292,7 @@ static struct drm_bus drm_pci_bus = { | |||
| 292 | .get_name = drm_pci_get_name, | 292 | .get_name = drm_pci_get_name, |
| 293 | .set_busid = drm_pci_set_busid, | 293 | .set_busid = drm_pci_set_busid, |
| 294 | .set_unique = drm_pci_set_unique, | 294 | .set_unique = drm_pci_set_unique, |
| 295 | .irq_by_busid = drm_pci_irq_by_busid, | ||
| 295 | .agp_init = drm_pci_agp_init, | 296 | .agp_init = drm_pci_agp_init, |
| 296 | }; | 297 | }; |
| 297 | 298 | ||
