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/radeon_device.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/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index ea7df16e2f8..0fb4f8993ca 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -955,7 +955,6 @@ int radeon_resume_kms(struct drm_device *dev) console_unlock(); return -1; } - pci_set_master(dev->pdev); /* resume AGP if in use */ radeon_agp_resume(rdev); radeon_resume(rdev); |