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

sna: Fallthrough to opportunistic flushing after aperture checks 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-10-27 16:45:53 +00:00
parent 4e0a01a7a3
commit 9266e35b42
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sna/kgem.c
View File

@ -4706,7 +4706,8 @@ bool kgem_check_bo(struct kgem *kgem, ...)
if (num_pages + kgem->aperture > kgem->aperture_high) {
DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
__FUNCTION__, num_pages + kgem->aperture, kgem->aperture_high));
return aperture_check(kgem, num_pages + kgem->aperture);
if (!aperture_check(kgem, num_pages + kgem->aperture))
return false;
}
return kgem_flush(kgem, flush);
@ -4771,7 +4772,8 @@ bool kgem_check_bo_fenced(struct kgem *kgem, struct kgem_bo *bo)
if (kgem->aperture + num_pages(bo) > kgem->aperture_high - kgem->aperture_fenced) {
DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
__FUNCTION__, num_pages(bo) + kgem->aperture, kgem->aperture_high));
return aperture_check(kgem, num_pages(bo) + kgem->aperture + kgem->aperture_fenced);
if (!aperture_check(kgem, num_pages(bo) + kgem->aperture + kgem->aperture_fenced))
return false;
}
return kgem_flush(kgem, bo->flush);
@ -4843,7 +4845,8 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...)
if (num_pages + kgem->aperture > kgem->aperture_high - kgem->aperture_fenced) {
DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
__FUNCTION__, num_pages + kgem->aperture, kgem->aperture_high));
return aperture_check(kgem, num_pages + kgem->aperture + kgem->aperture_fenced);
if (!aperture_check(kgem, num_pages + kgem->aperture + kgem->aperture_fenced))
return false;
}
return kgem_flush(kgem, flush);