aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/ttm
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-07-03 03:02:23 -0400
committerDave Airlie <airlied@redhat.com>2014-07-07 21:15:58 -0400
commite3f202798aaa808e7a38faa8c3a9f0aa93b85cc0 (patch)
tree3eac926b195d382c73a900c2eae11137aab9cf09 /include/drm/ttm
parent4e4e7dc55af5aa62497ac060e3cfd143bd4b4db3 (diff)
drm/ttm: fix handling of TTM_PL_FLAG_TOPDOWN v2
bo->mem.placement is not initialized when ttm_bo_man_get_node is called, so the flag had no effect at all. v2: change nouveau and vmwgfx as well Signed-off-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/ttm')
-rw-r--r--include/drm/ttm/ttm_bo_driver.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index e3f8c99a8a9d..202f0a7171e8 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -182,6 +182,7 @@ struct ttm_mem_type_manager_func {
182 * @man: Pointer to a memory type manager. 182 * @man: Pointer to a memory type manager.
183 * @bo: Pointer to the buffer object we're allocating space for. 183 * @bo: Pointer to the buffer object we're allocating space for.
184 * @placement: Placement details. 184 * @placement: Placement details.
185 * @flags: Additional placement flags.
185 * @mem: Pointer to a struct ttm_mem_reg to be filled in. 186 * @mem: Pointer to a struct ttm_mem_reg to be filled in.
186 * 187 *
187 * This function should allocate space in the memory type managed 188 * This function should allocate space in the memory type managed
@@ -206,6 +207,7 @@ struct ttm_mem_type_manager_func {
206 int (*get_node)(struct ttm_mem_type_manager *man, 207 int (*get_node)(struct ttm_mem_type_manager *man,
207 struct ttm_buffer_object *bo, 208 struct ttm_buffer_object *bo,
208 struct ttm_placement *placement, 209 struct ttm_placement *placement,
210 uint32_t flags,
209 struct ttm_mem_reg *mem); 211 struct ttm_mem_reg *mem);
210 212
211 /** 213 /**