---

yaml --- r: 168481 b: refs/heads/master c: df67bed h: refs/heads/master i: 168479: 58d6fdc v: v3
git-mirror · Nov 3, 2009 · 00fefea · 00fefea
1 parent 0c9c7f0
commit 00fefea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea1495a6274c9542a168337536f8ce74d1173f23
+refs/heads/master: df67bed92fa86ef926da8b62a6da68722388ff72
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_ttm.c b/trunk/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -295,6 +295,12 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
 	if (unlikely(r)) {
 		return r;
 	}
+
+	r = ttm_tt_set_placement_caching(bo->ttm, tmp_mem.placement);
+	if (unlikely(r)) {
+		goto out_cleanup;
+	}
+
 	r = ttm_tt_bind(bo->ttm, &tmp_mem);
 	if (unlikely(r)) {
 		goto out_cleanup;

diff --git a/trunk/drivers/gpu/drm/ttm/ttm_tt.c b/trunk/drivers/gpu/drm/ttm/ttm_tt.c
@@ -279,6 +279,7 @@ int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement)
 
 	return ttm_tt_set_caching(ttm, state);
 }
+EXPORT_SYMBOL(ttm_tt_set_placement_caching);
 
 static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     	return ttm_tt_set_caching(ttm, state);
     }
+    EXPORT_SYMBOL(ttm_tt_set_placement_caching);
     static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)
     {
@@ Expand Down @@