Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Suppress an overwritten XY_SRC_COPY 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-12-16 23:07:37 +00:00
parent 1684ed6a5e
commit e0399ec161
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sna/sna_blt.c
View File

@ -1492,6 +1492,7 @@ static Bool sna_blt_fill_box(struct sna *sna, uint8_t alu,
{
struct kgem *kgem = &sna->kgem;
uint32_t br13, cmd, *b;
bool overwrites;
DBG(("%s: box=((%d, %d), (%d, %d))\n", __FUNCTION__,
box->x1, box->y1, box->x2, box->y2));
@ -1526,8 +1527,8 @@ static Bool sna_blt_fill_box(struct sna *sna, uint8_t alu,
}
/* All too frequently one blt completely overwrites the previous */
if (kgem->nbatch >= 6 &&
(alu == GXcopy || alu == GXclear || alu == GXset) &&
overwrites = alu == GXcopy || alu == GXclear || alu == GXset;
if (overwrites && kgem->nbatch >= 6 &&
kgem->batch[kgem->nbatch-6] == cmd &&
*(uint64_t *)&kgem->batch[kgem->nbatch-4] == *(uint64_t *)box &&
kgem->reloc[kgem->nreloc-1].target_handle == bo->handle) {
@ -1536,6 +1537,21 @@ static Bool sna_blt_fill_box(struct sna *sna, uint8_t alu,
kgem->batch[kgem->nbatch-1] = color;
return TRUE;
}
if (overwrites && kgem->nbatch >= 8 &&
(kgem->batch[kgem->nbatch-8] & 0xffc0000f) == XY_SRC_COPY_BLT_CMD &&
*(uint64_t *)&kgem->batch[kgem->nbatch-6] == *(uint64_t *)box &&
kgem->reloc[kgem->nreloc-2].target_handle == bo->handle) {
DBG(("%s: replacing last copy\n", __FUNCTION__));
kgem->batch[kgem->nbatch-8] = cmd;
kgem->batch[kgem->nbatch-7] = br13;
kgem->batch[kgem->nbatch-3] = color;
/* Keep the src bo as part of the execlist, just remove
* its relocation entry.
*/
kgem->nreloc--;
kgem->nbatch -= 2;
return TRUE;
}
kgem_set_mode(kgem, KGEM_BLT);
if (!kgem_check_batch(kgem, 6) ||