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

gallium/radeon: inline radeon_winsys::query_memory_usage

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2016-07-29 21:41:23 +02:00
parent 9646ae7799
commit 076db67217
4 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeon/r600_pipe_common.c
+1 -1
View File
@@ -203,7 +203,7 @@ void r600_dma_emit_wait_idle(struct r600_common_context *rctx)
* It improves texture upload performance by keeping the DMA
* engine busy while uploads are being submitted.
*/
if (rctx->ws->cs_query_memory_usage(rctx->dma.cs) > 64 * 1024 * 1024) {
if (cs->used_vram + cs->used_gart > 64 * 1024 * 1024) {
rctx->dma.flush(rctx, RADEON_FLUSH_ASYNC, NULL);
return;
}
src/gallium/drivers/radeon/radeon_winsys.h
-2
View File
@@ -718,8 +718,6 @@ struct radeon_winsys {
bool (*cs_memory_below_limit)(struct radeon_winsys_cs *cs,
uint64_t vram, uint64_t gtt);
uint64_t (*cs_query_memory_usage)(struct radeon_winsys_cs *cs);
/**
* Return the buffer list.
*
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
-6
View File
@@ -799,11 +799,6 @@ static bool amdgpu_cs_memory_below_limit(struct radeon_winsys_cs *rcs,
return gtt < ws->info.gart_size * 0.7;
}
static uint64_t amdgpu_cs_query_memory_usage(struct radeon_winsys_cs *rcs)
{
return rcs->used_vram + rcs->used_gart;
}
static unsigned amdgpu_cs_get_buffer_list(struct radeon_winsys_cs *rcs,
struct radeon_bo_list_item *list)
{
@@ -1118,7 +1113,6 @@ void amdgpu_cs_init_functions(struct amdgpu_winsys *ws)
ws->base.cs_validate = amdgpu_cs_validate;
ws->base.cs_check_space = amdgpu_cs_check_space;
ws->base.cs_memory_below_limit = amdgpu_cs_memory_below_limit;
ws->base.cs_query_memory_usage = amdgpu_cs_query_memory_usage;
ws->base.cs_get_buffer_list = amdgpu_cs_get_buffer_list;
ws->base.cs_flush = amdgpu_cs_flush;
ws->base.cs_is_buffer_referenced = amdgpu_bo_is_referenced;
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
-6
View File
@@ -404,11 +404,6 @@ static bool radeon_drm_cs_memory_below_limit(struct radeon_winsys_cs *rcs, uint6
return gtt < cs->ws->info.gart_size * 0.7;
}
static uint64_t radeon_drm_cs_query_memory_usage(struct radeon_winsys_cs *rcs)
{
return rcs->used_vram + rcs->used_gart;
}
static unsigned radeon_drm_cs_get_buffer_list(struct radeon_winsys_cs *rcs,
struct radeon_bo_list_item *list)
{
@@ -682,7 +677,6 @@ void radeon_drm_cs_init_functions(struct radeon_drm_winsys *ws)
ws->base.cs_validate = radeon_drm_cs_validate;
ws->base.cs_check_space = radeon_drm_cs_check_space;
ws->base.cs_memory_below_limit = radeon_drm_cs_memory_below_limit;
ws->base.cs_query_memory_usage = radeon_drm_cs_query_memory_usage;
ws->base.cs_get_buffer_list = radeon_drm_cs_get_buffer_list;
ws->base.cs_flush = radeon_drm_cs_flush;
ws->base.cs_is_buffer_referenced = radeon_bo_is_referenced;