fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-17 01:40:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

crocus: find correct relocation target for the bo.

Browse source 
If we have batch a + b, and writing to batch b, causes batch a
to flush, all the bo->index get reset, and we try to submit a -1
to the kernel.

Look the bo index up when creating relocations.

Fixes crash seen in KHR-GL46.compute_shader.pipeline-post-fs
and a trace from Wasteland 3

Fixes: f3630548f1 ("crocus: initial gallium driver for Intel gfx 4-7")

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14905>
(cherry picked from commit 37c3be6947)
This commit is contained in:
Dave Airlie 2022-02-07 16:19:15 +10:00 • committed by Eric Engestrom
parent 808eec704d
commit 3cbc17121b
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -571,7 +571,7 @@
"description": "crocus: find correct relocation target for the bo.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f3630548f1da904ec6c63b43ece7e68afdb8867e"
},

21
src/gallium/drivers/crocus/crocus_batch.c
View file

@ -264,21 +264,30 @@ crocus_init_batch(struct crocus_context *ice,
crocus_batch_reset(batch);
}
static struct drm_i915_gem_exec_object2 *
find_validation_entry(struct crocus_batch *batch, struct crocus_bo *bo)
static int
find_exec_index(struct crocus_batch *batch, struct crocus_bo *bo)
{
unsigned index = READ_ONCE(bo->index);
if (index < batch->exec_count && batch->exec_bos[index] == bo)
return &batch->validation_list[index];
return index;
/* May have been shared between multiple active batches */
for (index = 0; index < batch->exec_count; index++) {
if (batch->exec_bos[index] == bo)
return &batch->validation_list[index];
return index;
}
return -1;
}
return NULL;
static struct drm_i915_gem_exec_object2 *
find_validation_entry(struct crocus_batch *batch, struct crocus_bo *bo)
{
int index = find_exec_index(batch, bo);
if (index == -1)
return NULL;
return &batch->validation_list[index];
}
static void
@ -410,7 +419,7 @@ emit_reloc(struct crocus_batch *batch,
(struct drm_i915_gem_relocation_entry) {
.offset = offset,
.delta = target_offset,
.target_handle = target->index,
.target_handle = find_exec_index(batch, target),
.presumed_offset = entry->offset,
};