diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-03 12:53:05 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-12 10:27:47 +0200 |
| commit | 2099810f903caa1920f3ef6014fb7f36e4786490 (patch) | |
| tree | d1cc8db0b4e224c83ccd5ea071102212b37185a3 /drivers/gpu/drm/radeon/radeon_kms.c | |
| parent | Linux 3.4-rc2 (diff) | |
| download | linux-2099810f903caa1920f3ef6014fb7f36e4786490.tar.xz linux-2099810f903caa1920f3ef6014fb7f36e4786490.zip | |
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_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 3c2628b14d56..f1016a5820d1 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -57,8 +57,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) } dev->dev_private = (void *)rdev; - pci_set_master(dev->pdev); - /* update BUS flag */ if (drm_pci_device_is_agp(dev)) { flags |= RADEON_IS_AGP; |