drm/i915: set num_fence_regs to 0 if there is no aperture

We can't fence anything without aperture.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191029095856.25431-3-matthew.auld@intel.com

diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
index 321189e1b0f2990b64793cd720fa1e28740e32c6..71efccfde122efae43f4bdd6a03b85b64f4733f0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c
@@ -846,8 +846,10 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt)
 
        detect_bit_6_swizzle(ggtt);
 
-       if (INTEL_GEN(i915) >= 7 &&
-           !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
+       if (!i915_ggtt_has_aperture(ggtt))
+               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) ||