From aa3775c8e4aa0bf063121eada45564e1d2c8bb14 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Fri, 3 Jan 2020 10:42:10 -0800 Subject: [PATCH] iris: Map with WC on non-LLC platforms. Reworks: * Jordan: Required rework following f62724ccacf ("iris: Pick a single mmap mode (WB/WC) at BO allocation time") Reviewed-by: Jason Ekstrand Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 3076ced1686..7cdb4474d98 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -595,9 +595,9 @@ iris_bo_alloc(struct iris_bufmgr *bufmgr, uint64_t bo_size = bucket ? bucket->size : MAX2(ALIGN(size, page_size), page_size); + bool is_coherent = bufmgr->has_llc || (flags & BO_ALLOC_COHERENT); enum iris_mmap_mode desired_mmap_mode = - (bufmgr->has_llc || (flags & BO_ALLOC_COHERENT)) ? IRIS_MMAP_WB - : IRIS_MMAP_WC; + !local && is_coherent ? IRIS_MMAP_WB : IRIS_MMAP_WC; mtx_lock(&bufmgr->lock);