From: Dave Airlie Date: Fri, 12 Sep 2014 04:32:40 +0000 (+1000) Subject: drm/ast: switch to using CACHED by default for sysram X-Git-Tag: firefly_0821_release~176^2~3035^2~40 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a9d6dd2554e35c0213382fff19f5dbf151707955;p=firefly-linux-kernel-4.4.55.git drm/ast: switch to using CACHED by default for sysram This fixes problems on ppc64 platforms, where we could end up using a WC mapping for migrating BOs with memcpy, when really we want to use cached memory. Tested-by: Ben Herrenschmidt Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index 8008ea0bc76c..5098c7dd435c 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -300,9 +300,9 @@ void ast_ttm_placement(struct ast_bo *bo, int domain) if (domain & TTM_PL_FLAG_VRAM) bo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM; if (domain & TTM_PL_FLAG_SYSTEM) - bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; + bo->placements[c++].flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM; if (!c) - bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; + bo->placements[c++].flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM; bo->placement.num_placement = c; bo->placement.num_busy_placement = c; for (i = 0; i < c; ++i) {