AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon: Update regulary cs processing info from kernel.

Browse Source 
This fixes problem that dma buffers were leaking in dri1 mode.

Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
This commit is contained in:
Pauli Nieminen
2009-08-19 23:11:14 +03:00
committed by Alex Deucher
parent 8604a896a6
commit ec1540052b
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
+7 -6
View File
@@ -235,8 +235,9 @@ static int legacy_wait_pending(struct radeon_bo *bo)
return 0;
}
static void legacy_track_pending(struct bo_manager_legacy *boml, int debug)
void legacy_track_pending(struct radeon_bo_manager *bom, int debug)
{
struct bo_manager_legacy *boml = (struct bo_manager_legacy*) bom;
struct bo_legacy *bo_legacy;
struct bo_legacy *next;
@@ -244,8 +245,8 @@ static void legacy_track_pending(struct bo_manager_legacy *boml, int debug)
bo_legacy = boml->pending_bos.pnext;
while (bo_legacy) {
if (debug)
fprintf(stderr,"pending %p %d %d %d\n", bo_legacy, bo_legacy->base.size,
boml->current_age, bo_legacy->pending);
fprintf(stderr,"pending %p %d %d %d\n", bo_legacy, bo_legacy->base.size,
boml->current_age, bo_legacy->pending);
next = bo_legacy->pnext;
if (legacy_is_pending(&(bo_legacy->base))) {
}
@@ -444,7 +445,7 @@ static struct radeon_bo *bo_open(struct radeon_bo_manager *bom,
if (bo_legacy->base.domains & RADEON_GEM_DOMAIN_GTT)
{
retry:
legacy_track_pending(boml, 0);
legacy_track_pending(&boml->base, 0);
/* dma buffers */
r = bo_dma_alloc(&(bo_legacy->base));
@@ -580,7 +581,7 @@ static int bo_vram_validate(struct radeon_bo *bo,
if (r) {
pending_retry = 0;
while(boml->cpendings && pending_retry++ < 10000) {
legacy_track_pending(boml, 0);
legacy_track_pending(&boml->base, 0);
retry_count++;
if (retry_count > 2) {
free(bo_legacy->tobj);
@@ -706,7 +707,7 @@ int radeon_bo_legacy_validate(struct radeon_bo *bo,
r = bo_vram_validate(bo, soffset, eoffset);
if (r) {
legacy_track_pending(boml, 0);
legacy_track_pending(&boml->base, 0);
legacy_kick_all_buffers(boml);
retries++;
if (retries == 2) {
src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
+1
View File
@@ -45,5 +45,6 @@ unsigned radeon_bo_legacy_relocs_size(struct radeon_bo *bo);
struct radeon_bo *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
int size,
uint32_t offset);
void legacy_track_pending(struct radeon_bo_manager *bom, int debug);
#endif
src/mesa/drivers/dri/radeon/radeon_dma.c
+4
View File
@@ -326,6 +326,10 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
__FUNCTION__, free, wait, reserved, rmesa->dma.minimum_size);
}
if (!rmesa->radeonScreen->driScreen->dri2.enabled) {
/* request updated cs processing information from kernel */
legacy_track_pending(rmesa->radeonScreen->bom, 0);
}
/* move waiting bos to free list.
wait list provides gpu time to handle data before reuse */
foreach_s(dma_bo, temp, &rmesa->dma.wait) {