From: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/drivers/radeon/r600_gpu_load.c | 6 +++---
src/gallium/drivers/radeon/r600_pipe_common.h | 2 +-
src/gallium/drivers/radeon/r600_query.c | 6 +++---
src/gallium/drivers/radeon/r600_query.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c
b/src/gallium/drivers/radeon/r600_gpu_load.c
index d8f7c3d..4e9f7ea 100644
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -114,21 +114,21 @@ static void r600_update_mmio_counters(struct
r600_common_screen *rscreen,
}
if (rscreen->chip_class >= VI) {
/* CP_STAT */
rscreen->ws->read_registers(rscreen->ws, CP_STAT, 1, &value);
UPDATE_COUNTER(pfp, PFP_BUSY);
UPDATE_COUNTER(meq, MEQ_BUSY);
UPDATE_COUNTER(me, ME_BUSY);
UPDATE_COUNTER(surf_sync, SURFACE_SYNC_BUSY);
- UPDATE_COUNTER(dma, DMA_BUSY);
+ UPDATE_COUNTER(cp_dma, DMA_BUSY);
UPDATE_COUNTER(scratch_ram, SCRATCH_RAM_BUSY);
UPDATE_COUNTER(ce, CE_BUSY);
}
value = gui_busy || sdma_busy;
UPDATE_COUNTER(gpu, IDENTITY);
}
#undef UPDATE_COUNTER
@@ -255,22 +255,22 @@ static unsigned busy_index_from_type(struct
r600_common_screen *rscreen,
case R600_QUERY_GPU_SDMA_BUSY:
return BUSY_INDEX(rscreen, sdma);
case R600_QUERY_GPU_PFP_BUSY:
return BUSY_INDEX(rscreen, pfp);
case R600_QUERY_GPU_MEQ_BUSY:
return BUSY_INDEX(rscreen, meq);
case R600_QUERY_GPU_ME_BUSY:
return BUSY_INDEX(rscreen, me);
case R600_QUERY_GPU_SURF_SYNC_BUSY:
return BUSY_INDEX(rscreen, surf_sync);
- case R600_QUERY_GPU_DMA_BUSY:
- return BUSY_INDEX(rscreen, dma);
+ case R600_QUERY_GPU_CP_DMA_BUSY:
+ return BUSY_INDEX(rscreen, cp_dma);
case R600_QUERY_GPU_SCRATCH_RAM_BUSY:
return BUSY_INDEX(rscreen, scratch_ram);
case R600_QUERY_GPU_CE_BUSY:
return BUSY_INDEX(rscreen, ce);
default:
unreachable("invalid query type");
}
}
uint64_t r600_begin_counter(struct r600_common_screen *rscreen, unsigned type)
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h
b/src/gallium/drivers/radeon/r600_pipe_common.h
index fb52dfb..b02f9f0 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -364,21 +364,21 @@ union r600_mmio_counters {
struct r600_mmio_counter cb;
/* SRBM_STATUS2 */
struct r600_mmio_counter sdma;
/* CP_STAT */
struct r600_mmio_counter pfp;
struct r600_mmio_counter meq;
struct r600_mmio_counter me;
struct r600_mmio_counter surf_sync;
- struct r600_mmio_counter dma;
+ struct r600_mmio_counter cp_dma;
struct r600_mmio_counter scratch_ram;
struct r600_mmio_counter ce;
} named;
unsigned array[0];
};
struct r600_common_screen {
struct pipe_screen b;
struct radeon_winsys *ws;
enum radeon_family family;
diff --git a/src/gallium/drivers/radeon/r600_query.c
b/src/gallium/drivers/radeon/r600_query.c
index 4069d2e..5f1f712 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -207,21 +207,21 @@ static bool r600_query_sw_begin(struct
r600_common_context *rctx,
case R600_QUERY_GPU_SC_BUSY:
case R600_QUERY_GPU_PA_BUSY:
case R600_QUERY_GPU_DB_BUSY:
case R600_QUERY_GPU_CP_BUSY:
case R600_QUERY_GPU_CB_BUSY:
case R600_QUERY_GPU_SDMA_BUSY:
case R600_QUERY_GPU_PFP_BUSY:
case R600_QUERY_GPU_MEQ_BUSY:
case R600_QUERY_GPU_ME_BUSY:
case R600_QUERY_GPU_SURF_SYNC_BUSY:
- case R600_QUERY_GPU_DMA_BUSY:
+ case R600_QUERY_GPU_CP_DMA_BUSY:
case R600_QUERY_GPU_SCRATCH_RAM_BUSY:
case R600_QUERY_GPU_CE_BUSY:
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);
break;
case R600_QUERY_NUM_SHADERS_CREATED:
query->begin_result =
p_atomic_read(&rctx->screen->num_shaders_created);
@@ -361,21 +361,21 @@ static bool r600_query_sw_end(struct r600_common_context
*rctx,
case R600_QUERY_GPU_SC_BUSY:
case R600_QUERY_GPU_PA_BUSY:
case R600_QUERY_GPU_DB_BUSY:
case R600_QUERY_GPU_CP_BUSY:
case R600_QUERY_GPU_CB_BUSY:
case R600_QUERY_GPU_SDMA_BUSY:
case R600_QUERY_GPU_PFP_BUSY:
case R600_QUERY_GPU_MEQ_BUSY:
case R600_QUERY_GPU_ME_BUSY:
case R600_QUERY_GPU_SURF_SYNC_BUSY:
- case R600_QUERY_GPU_DMA_BUSY:
+ case R600_QUERY_GPU_CP_DMA_BUSY:
case R600_QUERY_GPU_SCRATCH_RAM_BUSY:
case R600_QUERY_GPU_CE_BUSY:
query->end_result = r600_end_counter(rctx->screen,
query->b.type,
query->begin_result);
query->begin_result = 0;
break;
case R600_QUERY_NUM_COMPILATIONS:
query->end_result =
p_atomic_read(&rctx->screen->num_compilations);
break;
@@ -2058,21 +2058,21 @@ static struct pipe_driver_query_info
r600_driver_query_list[] = {
X("GPU-sc-busy", GPU_SC_BUSY, UINT64,
AVERAGE),
X("GPU-pa-busy", GPU_PA_BUSY, UINT64,
AVERAGE),
X("GPU-db-busy", GPU_DB_BUSY, UINT64,
AVERAGE),
X("GPU-cp-busy", GPU_CP_BUSY, UINT64,
AVERAGE),
X("GPU-cb-busy", GPU_CB_BUSY, UINT64,
AVERAGE),
X("GPU-sdma-busy", GPU_SDMA_BUSY, UINT64,
AVERAGE),
X("GPU-pfp-busy", GPU_PFP_BUSY, UINT64,
AVERAGE),
X("GPU-meq-busy", GPU_MEQ_BUSY, UINT64,
AVERAGE),
X("GPU-me-busy", GPU_ME_BUSY, UINT64,
AVERAGE),
X("GPU-surf-sync-busy", GPU_SURF_SYNC_BUSY, UINT64,
AVERAGE),
- X("GPU-dma-busy", GPU_DMA_BUSY, UINT64,
AVERAGE),
+ X("GPU-cp-dma-busy", GPU_CP_DMA_BUSY, UINT64,
AVERAGE),
X("GPU-scratch-ram-busy", GPU_SCRATCH_RAM_BUSY, UINT64,
AVERAGE),
X("GPU-ce-busy", GPU_CE_BUSY, UINT64,
AVERAGE),
};
#undef X
#undef XG
#undef XFULL
static unsigned r600_get_num_queries(struct r600_common_screen *rscreen)
{
diff --git a/src/gallium/drivers/radeon/r600_query.h
b/src/gallium/drivers/radeon/r600_query.h
index 5565d70..ca27be5 100644
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -92,21 +92,21 @@ enum {
R600_QUERY_GPU_SC_BUSY,
R600_QUERY_GPU_PA_BUSY,
R600_QUERY_GPU_DB_BUSY,
R600_QUERY_GPU_CP_BUSY,
R600_QUERY_GPU_CB_BUSY,
R600_QUERY_GPU_SDMA_BUSY,
R600_QUERY_GPU_PFP_BUSY,
R600_QUERY_GPU_MEQ_BUSY,
R600_QUERY_GPU_ME_BUSY,
R600_QUERY_GPU_SURF_SYNC_BUSY,
- R600_QUERY_GPU_DMA_BUSY,
+ R600_QUERY_GPU_CP_DMA_BUSY,
R600_QUERY_GPU_SCRATCH_RAM_BUSY,
R600_QUERY_GPU_CE_BUSY,
R600_QUERY_NUM_COMPILATIONS,
R600_QUERY_NUM_SHADERS_CREATED,
R600_QUERY_BACK_BUFFER_PS_DRAW_RATIO,
R600_QUERY_NUM_SHADER_CACHE_HITS,
R600_QUERY_GPIN_ASIC_ID,
R600_QUERY_GPIN_NUM_SIMD,
R600_QUERY_GPIN_NUM_RB,
R600_QUERY_GPIN_NUM_SPI,
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
