Commit bb9e8755 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Fixup recursive MI_BB_START for gen3

There's no magic bit0 in MI_BB_START for gen3, it's the same dword length
parameter as elsewhere and needs to be zero.

v2: Same bug in both live_requests and live_hanghcheck.

References: https://bugs.freedesktop.org/show_bug.cgi?id=107132Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180705154756.5533-1-chris@chris-wilson.co.ukReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent f0d759f0
...@@ -594,11 +594,8 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915) ...@@ -594,11 +594,8 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915)
} else if (gen >= 6) { } else if (gen >= 6) {
*cmd++ = MI_BATCH_BUFFER_START | 1 << 8; *cmd++ = MI_BATCH_BUFFER_START | 1 << 8;
*cmd++ = lower_32_bits(vma->node.start); *cmd++ = lower_32_bits(vma->node.start);
} else if (gen >= 4) {
*cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
*cmd++ = lower_32_bits(vma->node.start);
} else { } else {
*cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT | 1; *cmd++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
*cmd++ = lower_32_bits(vma->node.start); *cmd++ = lower_32_bits(vma->node.start);
} }
*cmd++ = MI_BATCH_BUFFER_END; /* terminate early in case of error */ *cmd++ = MI_BATCH_BUFFER_END; /* terminate early in case of error */
......
...@@ -193,7 +193,7 @@ static int emit_recurse_batch(struct hang *h, ...@@ -193,7 +193,7 @@ static int emit_recurse_batch(struct hang *h,
batch += 1024 / sizeof(*batch); batch += 1024 / sizeof(*batch);
*batch++ = MI_ARB_CHECK; *batch++ = MI_ARB_CHECK;
*batch++ = MI_BATCH_BUFFER_START | 2 << 6 | 1; *batch++ = MI_BATCH_BUFFER_START | 2 << 6;
*batch++ = lower_32_bits(vma->node.start); *batch++ = lower_32_bits(vma->node.start);
} }
*batch++ = MI_BATCH_BUFFER_END; /* not reached */ *batch++ = MI_BATCH_BUFFER_END; /* not reached */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment