diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-03 11:53:05 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-12 09:27:47 +0100 |
| commit | 2099810f903caa1920f3ef6014fb7f36e4786490 (patch) | |
| tree | d1cc8db0b4e224c83ccd5ea071102212b37185a3 /drivers/gpu/drm/radeon/r600.c | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
drm/radeon: enable pci bus mastering after card is initialised (v2)
This closes a race seen with kexec where we enable PCI bus mastering
but the card has been reinitialised fully yet.
This was previously fixed by a patch from Jerome, but this should
close the race completely.
v2: add SI support as suggested by Alex.
Reported-and-tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 391bd2636a8..4added1c7ee 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -3047,6 +3047,9 @@ int r600_irq_init(struct radeon_device *rdev) else r600_disable_interrupt_state(rdev); + /* at this point everything should be setup correctly to enable master */ + pci_set_master(rdev->pdev); + /* enable irqs */ r600_enable_interrupts(rdev); |