Commit db78e27d authored by Francisco Jerez's avatar Francisco Jerez Committed by Dave Airlie
Browse files

drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.

Fixes errors like:
> reserve_ram_pages_type failed 0x15b7a000-0x15b7b000, track 0x8, req 0x10
when a BO is moved between WC and UC areas.

Reported-by: default avatarXavier Chantry <>
Signed-off-by: default avatarFrancisco Jerez <>
Acked-by: default avatarThomas Hellstrom <>
Signed-off-by: default avatarDave Airlie <>
parent f28cf339
......@@ -198,17 +198,26 @@ EXPORT_SYMBOL(ttm_tt_populate);
static inline int ttm_tt_set_page_caching(struct page *p,
enum ttm_caching_state c_state)
int ret = 0;
if (PageHighMem(p))
return 0;
switch (c_state) {
case tt_cached:
return set_pages_wb(p, 1);
case tt_wc:
return set_memory_wc((unsigned long) page_address(p), 1);
return set_pages_uc(p, 1);
if (get_page_memtype(p) != -1) {
/* p isn't in the default caching state, set it to
* writeback first to free its current memtype. */
ret = set_pages_wb(p, 1);
if (ret)
return ret;
if (c_state == tt_wc)
ret = set_memory_wc((unsigned long) page_address(p), 1);
else if (c_state == tt_uncached)
ret = set_pages_uc(p, 1);
return ret;
#else /* CONFIG_X86 */
static inline int ttm_tt_set_page_caching(struct page *p,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment