Patchwork [1/3] Revert "drm/radeon/bo: add some fallback placements for VRAM only objects."

login
register
mail settings
Submitter Andy Whitcroft
Date March 2, 2011, 5:55 p.m.
Message ID <1299088507-1094-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/85121/
State Accepted
Delegated to: Tim Gardner
Headers show

Comments

Andy Whitcroft - March 2, 2011, 5:55 p.m.
BugLink: http://bugs.launchpad.net/bugs/652934

This reverts commit ae2e767a2b2be23d6131cf463f3de730014dc070.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/gpu/drm/radeon/radeon.h        |    2 --
 drivers/gpu/drm/radeon/radeon_object.c |   10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index eb7eb2b..cba2497 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -214,9 +214,7 @@  struct radeon_bo {
 	struct list_head		list;
 	/* Protected by tbo.reserved */
 	u32				placements[3];
-	u32				busy_placements[3];
 	struct ttm_placement		placement;
-	struct ttm_placement		busy_placement;
 	struct ttm_buffer_object	tbo;
 	struct ttm_bo_kmap_obj		kmap;
 	unsigned			pin_count;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index e781fa9..f1da370 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -65,19 +65,15 @@  bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo)
 
 void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
 {
-	u32 c = 0, b = 0;
+	u32 c = 0;
 
 	rbo->placement.fpfn = 0;
 	rbo->placement.lpfn = 0;
 	rbo->placement.placement = rbo->placements;
-	rbo->placement.busy_placement = rbo->busy_placements;
+	rbo->placement.busy_placement = rbo->placements;
 	if (domain & RADEON_GEM_DOMAIN_VRAM)
 		rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
 					TTM_PL_FLAG_VRAM;
-	/* add busy placement to TTM if VRAM is only option */
-	if (domain == RADEON_GEM_DOMAIN_VRAM) {
-		rbo->busy_placements[b++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
-	}
 	if (domain & RADEON_GEM_DOMAIN_GTT)
 		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
 	if (domain & RADEON_GEM_DOMAIN_CPU)
@@ -85,7 +81,7 @@  void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
 	if (!c)
 		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
 	rbo->placement.num_placement = c;
-	rbo->placement.num_busy_placement = b;
+	rbo->placement.num_busy_placement = c;
 }
 
 int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,