Commit ad5d95e4 authored by Dave Airlie's avatar Dave Airlie

Revert "drm/i915/gem: Async GPU relocations only"

These commits caused a regression on Lenovo t520 sandybridge
machine belonging to reporter. We are reverting them for 5.10
for other reasons, so just do it for 5.9 as well.

This reverts commit 9e0f9464.
Reported-by: default avatarHarald Arnesen <harald@skogtun.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4993a8a3
...@@ -37,14 +37,20 @@ static int __igt_gpu_reloc(struct i915_execbuffer *eb, ...@@ -37,14 +37,20 @@ static int __igt_gpu_reloc(struct i915_execbuffer *eb,
return err; return err;
/* 8-Byte aligned */ /* 8-Byte aligned */
err = __reloc_entry_gpu(eb, vma, offsets[0] * sizeof(u32), 0); if (!__reloc_entry_gpu(eb, vma,
if (err) offsets[0] * sizeof(u32),
0)) {
err = -EIO;
goto unpin_vma; goto unpin_vma;
}
/* !8-Byte aligned */ /* !8-Byte aligned */
err = __reloc_entry_gpu(eb, vma, offsets[1] * sizeof(u32), 1); if (!__reloc_entry_gpu(eb, vma,
if (err) offsets[1] * sizeof(u32),
1)) {
err = -EIO;
goto unpin_vma; goto unpin_vma;
}
/* Skip to the end of the cmd page */ /* Skip to the end of the cmd page */
i = PAGE_SIZE / sizeof(u32) - RELOC_TAIL - 1; i = PAGE_SIZE / sizeof(u32) - RELOC_TAIL - 1;
...@@ -54,9 +60,12 @@ static int __igt_gpu_reloc(struct i915_execbuffer *eb, ...@@ -54,9 +60,12 @@ static int __igt_gpu_reloc(struct i915_execbuffer *eb,
eb->reloc_cache.rq_size += i; eb->reloc_cache.rq_size += i;
/* Force batch chaining */ /* Force batch chaining */
err = __reloc_entry_gpu(eb, vma, offsets[2] * sizeof(u32), 2); if (!__reloc_entry_gpu(eb, vma,
if (err) offsets[2] * sizeof(u32),
2)) {
err = -EIO;
goto unpin_vma; goto unpin_vma;
}
GEM_BUG_ON(!eb->reloc_cache.rq); GEM_BUG_ON(!eb->reloc_cache.rq);
rq = i915_request_get(eb->reloc_cache.rq); rq = i915_request_get(eb->reloc_cache.rq);
......
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