There's no magic bit0 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.

Signed-off-by: Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/selftests/i915_request.c    | 5 +----
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c 
b/drivers/gpu/drm/i915/selftests/i915_request.c
index 675017bf59dd..cc27edc40356 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -594,11 +594,8 @@ static struct i915_vma *recursive_batch(struct 
drm_i915_private *i915)
        } else if (gen >= 6) {
                *cmd++ = MI_BATCH_BUFFER_START | 1 << 8;
                *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 {
-               *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++ = MI_BATCH_BUFFER_END; /* terminate early in case of error */
diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c 
b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
index fca073c96c2d..5cb808dc5b50 100644
--- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
+++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
@@ -193,7 +193,7 @@ static int emit_recurse_batch(struct hang *h,
                batch += 1024 / sizeof(*batch);
 
                *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++ = MI_BATCH_BUFFER_END; /* not reached */
-- 
2.18.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to