diff options
| author | Samuel Pitoiset <[email protected]> | 2017-01-20 18:15:50 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-01-23 21:19:49 +0100 |
| commit | a704f1924765fb1cac61cdb9d6e84ad2cb5c7f9c (patch) | |
| tree | 52b2a3a627d091483746551b4963ca12979d7eef /src/gallium/drivers/radeon/r600_query.c | |
| parent | 00847e4f14dd237dfcdb2c3d15be1325a08ccf5a (diff) | |
gallium/radeon: refactor the GRBM counters path
This will allow to expose more queries in order to know which
blocks are busy/idle.
v2: - add new lines after ':'
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_query.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 5712cbe63fb..1f9f1910491 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -145,10 +145,9 @@ static bool r600_query_sw_begin(struct r600_common_context *rctx, break; } case R600_QUERY_GPU_LOAD: - query->begin_result = r600_begin_counter_gui(rctx->screen); - break; case R600_QUERY_GPU_SHADERS_BUSY: - query->begin_result = r600_begin_counter_spi(rctx->screen); + query->begin_result = r600_begin_counter(rctx->screen, + query->b.type); break; case R600_QUERY_NUM_COMPILATIONS: query->begin_result = p_atomic_read(&rctx->screen->num_compilations); @@ -239,13 +238,10 @@ static bool r600_query_sw_end(struct r600_common_context *rctx, break; } case R600_QUERY_GPU_LOAD: - query->end_result = r600_end_counter_gui(rctx->screen, - query->begin_result); - query->begin_result = 0; - break; case R600_QUERY_GPU_SHADERS_BUSY: - query->end_result = r600_end_counter_spi(rctx->screen, - query->begin_result); + query->end_result = r600_end_counter(rctx->screen, + query->b.type, + query->begin_result); query->begin_result = 0; break; case R600_QUERY_NUM_COMPILATIONS: |