drm/i915: Add Wa_1209644611:icl,ehl

On gen11 the XY_FAST_COPY_BLT command has some size restrictions on its
usage.  Although this instruction is mainly used by userspace, i915 also
uses it to copy object contents during some selftests, so let's ensure
the restrictions are followed.

Bspec: 6544
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200311162300.1838847-3-matthew.d.roper@intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
index 39b8a055d80aa0e54f7fd6b738b544e21372b653..e00792158f130bfe87adab8786ffb17e07576505 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
@@ -196,6 +196,17 @@ out_unpin:
        return err;
 }
 
+/* Wa_1209644611:icl,ehl */
+static bool wa_1209644611_applies(struct drm_i915_private *i915, u32 size)
+{
+       u32 height = size >> PAGE_SHIFT;
+
+       if (!IS_GEN(i915, 11))
+               return false;
+
+       return height % 4 == 3 && height <= 8;
+}
+
 struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce,
                                         struct i915_vma *src,
                                         struct i915_vma *dst)
@@ -237,7 +248,8 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce,
                size = min_t(u64, rem, block_size);
                GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX);
 
-               if (INTEL_GEN(i915) >= 9) {
+               if (INTEL_GEN(i915) >= 9 &&
+                   !wa_1209644611_applies(i915, size)) {
                        *cmd++ = GEN9_XY_FAST_COPY_BLT_CMD | (10 - 2);
                        *cmd++ = BLT_DEPTH_32 | PAGE_SIZE;
                        *cmd++ = 0;