From: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>

We can't fence anything without aperture.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>
Signed-off-by: Stuart Summers <stuart.summ...@intel.com>
Cc: Matthew Auld <matthew.a...@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c 
b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
index bcac359ec661..bb7d9321cadf 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
@@ -808,8 +808,10 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt)
 
        detect_bit_6_swizzle(i915);
 
-       if (INTEL_GEN(i915) >= 7 &&
-           !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
+       if (!HAS_MAPPABLE_APERTURE(i915))
+               num_fences = 0;
+       else if (INTEL_GEN(i915) >= 7 &&
+                !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
                num_fences = 32;
        else if (INTEL_GEN(i915) >= 4 ||
                 IS_I945G(i915) || IS_I945GM(i915) ||
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to