From 0d38419cbeaae5f8b5260e4d4dd9cfa0d2694eae Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 15 Apr 2016 14:58:57 +0100 Subject: [PATCH] sna/gen9: Update mocs selection Since the choice is now boolean (use PTE or use WB), remove the third uncached condition. Signed-off-by: Chris Wilson --- src/sna/gen9_render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c index 889cded0..3c1f07ab 100644 --- a/src/sna/gen9_render.c +++ b/src/sna/gen9_render.c @@ -1427,7 +1427,7 @@ gen9_bind_bo(struct sna *sna, domains = I915_GEM_DOMAIN_RENDER << 16 |I915_GEM_DOMAIN_RENDER; } else domains = I915_GEM_DOMAIN_SAMPLER << 16; - ss[1] = (is_dst && is_uncached(sna, bo)) ? 0 : is_scanout ? MOCS_PTE << 24 : MOCS_WB << 24; + ss[1] = (is_scanout || (is_dst && is_uncached(sna, bo))) ? MOCS_PTE << 24 : MOCS_WB << 24; ss[2] = ((width - 1) << SURFACE_WIDTH_SHIFT | (height - 1) << SURFACE_HEIGHT_SHIFT); ss[3] = (bo->pitch - 1) << SURFACE_PITCH_SHIFT;