fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 09:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r600: fix reloc setup

Browse source 
re-use the same reloc index for bos that are referenced
multiple times.

Fixes rain demo.
This commit is contained in:
Alex Deucher 2009-07-31 14:48:46 -04:00
parent 177c33c481
commit 80d80d23b6
1 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/mesa/drivers/dri/r600/r600_cmdbuf.c
View file

@ -247,50 +247,44 @@ static int r600_cs_process_relocs(struct radeon_cs *cs,
csm = (struct r600_cs_manager_legacy*)cs->csm;
relocs = (struct r600_cs_reloc_legacy *)cs->relocs;
restart:
for (i = 0; i < cs->crelocs; i++)
{
for (j = 0; j < relocs[i].cindices; j++)
{
for (i = 0; i < cs->crelocs; i++) {
uint32_t soffset, eoffset, asicoffset;
r = radeon_bo_legacy_validate(relocs[i].base.bo,
&soffset, &eoffset);
if (r == -EAGAIN)
{
goto restart;
&soffset, &eoffset);
if (r == -EAGAIN) {
goto restart;
}
if (r)
{
fprintf(stderr, "validated %p [0x%08X, 0x%08X]\n",
relocs[i].base.bo, soffset, eoffset);
return r;
if (r) {
fprintf(stderr, "validated %p [0x%08X, 0x%08X]\n",
relocs[i].base.bo, soffset, eoffset);
return r;
}
asicoffset = soffset;
if (asicoffset >= eoffset)
{
/* radeon_bo_debug(relocs[i].base.bo, 12); */
fprintf(stderr, "validated %p [0x%08X, 0x%08X]\n",
relocs[i].base.bo, soffset, eoffset);
fprintf(stderr, "above end: %p 0x%08X 0x%08X\n",
relocs[i].base.bo,
cs->packets[relocs[i].indices[j]],
eoffset);
exit(0);
return -EINVAL;
}
/* pkt3 nop header in ib chunk */
cs->packets[relocs[i].reloc_indices[j]] = 0xC0001000;
for (j = 0; j < relocs[i].cindices; j++) {
if (asicoffset >= eoffset) {
/* radeon_bo_debug(relocs[i].base.bo, 12); */
fprintf(stderr, "validated %p [0x%08X, 0x%08X]\n",
relocs[i].base.bo, soffset, eoffset);
fprintf(stderr, "above end: %p 0x%08X 0x%08X\n",
relocs[i].base.bo,
cs->packets[relocs[i].indices[j]],
eoffset);
exit(0);
return -EINVAL;
}
/* pkt3 nop header in ib chunk */
cs->packets[relocs[i].reloc_indices[j]] = 0xC0001000;
/* reloc index in ib chunk */
cs->packets[relocs[i].reloc_indices[j] + 1] = offset_dw;
}
/* reloc index in ib chunk */
cs->packets[relocs[i].reloc_indices[j] + 1] = offset_dw;
/* asic offset in reloc chunk */ /* see alex drm r600_nomm_relocate */
reloc_chunk[offset_dw] = asicoffset;
reloc_chunk[offset_dw + 3] = 0;
/* asic offset in reloc chunk */ /* see alex drm r600_nomm_relocate */
reloc_chunk[offset_dw] = asicoffset;
reloc_chunk[offset_dw + 3] = 0;
offset_dw += 4;
}
offset_dw += 4;
}
*length_dw_reloc_chunk = offset_dw;