diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2012-01-12 16:04:11 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-01-13 10:02:34 +0100 |
commit | 642ce5251b4fefdb8f2a55396707b8fa9f953e05 (patch) | |
tree | 1ea2fc1b2ac9c3a0fa3b5920b53f2eafdc415f63 /drivers/gpu/drm/radeon/r100.c | |
parent | gma500: Discard modes that don't fit in stolen memory (diff) | |
download | linux-642ce5251b4fefdb8f2a55396707b8fa9f953e05.tar.xz linux-642ce5251b4fefdb8f2a55396707b8fa9f953e05.zip |
radeon: Call pci_clear_master() instead of open-coding it.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 3ec81c3d5108..bfd36ab643a6 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2186,7 +2186,6 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) void r100_bm_disable(struct radeon_device *rdev) { u32 tmp; - u16 tmp16; /* disable bus mastering */ tmp = RREG32(R_000030_BUS_CNTL); @@ -2197,8 +2196,7 @@ void r100_bm_disable(struct radeon_device *rdev) WREG32(R_000030_BUS_CNTL, (tmp & 0xFFFFFFFF) | 0x00000040); tmp = RREG32(RADEON_BUS_CNTL); mdelay(1); - pci_read_config_word(rdev->pdev, 0x4, &tmp16); - pci_write_config_word(rdev->pdev, 0x4, tmp16 & 0xFFFB); + pci_clear_master(rdev->pdev); mdelay(1); } |