aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2012-01-12 10:04:11 -0500
committerDave Airlie <airlied@redhat.com>2012-01-13 04:02:34 -0500
commit642ce5251b4fefdb8f2a55396707b8fa9f953e05 (patch)
tree1ea2fc1b2ac9c3a0fa3b5920b53f2eafdc415f63 /drivers/gpu/drm/radeon/r100.c
parent9f821c675a389cf4aab7f1dc8ee0860fba4f3204 (diff)
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.c4
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)
2186void r100_bm_disable(struct radeon_device *rdev) 2186void r100_bm_disable(struct radeon_device *rdev)
2187{ 2187{
2188 u32 tmp; 2188 u32 tmp;
2189 u16 tmp16;
2190 2189
2191 /* disable bus mastering */ 2190 /* disable bus mastering */
2192 tmp = RREG32(R_000030_BUS_CNTL); 2191 tmp = RREG32(R_000030_BUS_CNTL);
@@ -2197,8 +2196,7 @@ void r100_bm_disable(struct radeon_device *rdev)
2197 WREG32(R_000030_BUS_CNTL, (tmp & 0xFFFFFFFF) | 0x00000040); 2196 WREG32(R_000030_BUS_CNTL, (tmp & 0xFFFFFFFF) | 0x00000040);
2198 tmp = RREG32(RADEON_BUS_CNTL); 2197 tmp = RREG32(RADEON_BUS_CNTL);
2199 mdelay(1); 2198 mdelay(1);
2200 pci_read_config_word(rdev->pdev, 0x4, &tmp16); 2199 pci_clear_master(rdev->pdev);
2201 pci_write_config_word(rdev->pdev, 0x4, tmp16 & 0xFFFB);
2202 mdelay(1); 2200 mdelay(1);
2203} 2201}
2204 2202