gallium/radeon: rename GPU-dma-busy -> GPU-cp-dma-busy

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c b/src/gallium/drivers/radeon/r600_gpu_load.c
index d8f7c3d..4e9f7ea 100644 (file)
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -121,7 +121,7 @@ static void r600_update_mmio_counters(struct r600_common_screen *rscreen,
                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);
        }
@@ -262,8 +262,8 @@ static unsigned busy_index_from_type(struct r600_common_screen *rscreen,
                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:

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 57730cd..9105875 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -371,7 +371,7 @@ union r600_mmio_counters {
                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;

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 4069d2e..5f1f712 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -214,7 +214,7 @@ static bool r600_query_sw_begin(struct r600_common_context *rctx,
        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,
@@ -368,7 +368,7 @@ static bool r600_query_sw_end(struct r600_common_context *rctx,
        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,
@@ -2065,7 +2065,7 @@ static struct pipe_driver_query_info r600_driver_query_list[] = {
        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),
 };

diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
index 5565d70..ca27be5 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -99,7 +99,7 @@ enum {
        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,