summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-08-18 12:32:05 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-08-19 12:01:50 -0400
commitb738ca5d68e4051c86e32f46f67a69f3bb9cee5e (patch)
tree821008e2e2100dbe06f665527dabee3ee860f755
parent52da51f0f9ea9d213adfc99223630707b26d1d38 (diff)
downloadop-kernel-dev-b738ca5d68e4051c86e32f46f67a69f3bb9cee5e.zip
op-kernel-dev-b738ca5d68e4051c86e32f46f67a69f3bb9cee5e.tar.gz
Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe"
This reverts commit 1490434f0da63afc6006411c8829c6a7935a4e7e. Several people have reported regressions with this patch on kabini.
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 0678998..d656079 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -404,9 +404,7 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
/* Allocate ring buffer */
if (ring->ring_obj == NULL) {
r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
- RADEON_GEM_DOMAIN_GTT,
- (rdev->flags & RADEON_IS_PCIE) ?
- RADEON_GEM_GTT_WC : 0,
+ RADEON_GEM_DOMAIN_GTT, 0,
NULL, &ring->ring_obj);
if (r) {
dev_err(rdev->dev, "(%d) ring create failed\n", r);
OpenPOWER on IntegriCloud