projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'airlied/drm-next' into drm-intel-next
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_ttm.c
diff --git
a/drivers/gpu/drm/radeon/radeon_ttm.c
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 765bd184b6fc15382fc10b2dfaadd91414709054..1381e06d6af3ff317521aba0952ab5b2e1a397a9 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/
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;