gallium/radeon: include SDMA in the GPU load query

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
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 3b491188fb1f118269d52e3038d5de7d7284a49d..24f54c0e68e1c5ebe0dbc5df412e4e52527b6391 100644 (file)
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -70,6 +70,8 @@
 #define SCRATCH_RAM_BUSY(x)    (((x) >> 24) & 0x1)
 #define CE_BUSY(x)             (((x) >> 26) & 0x1)
 
+#define IDENTITY(x) x
+
 #define UPDATE_COUNTER(field, mask)                                    \
        do {                                                            \
                if (mask(value))                                        \
@@ -82,6 +84,7 @@ static void r600_update_mmio_counters(struct r600_common_screen *rscreen,
                                      union r600_mmio_counters *counters)
 {
        uint32_t value = 0;
+       bool gui_busy, sdma_busy = false;
 
        /* GRBM_STATUS */
        rscreen->ws->read_registers(rscreen->ws, GRBM_STATUS, 1, &value);
@@ -100,12 +103,14 @@ static void r600_update_mmio_counters(struct r600_common_screen *rscreen,
        UPDATE_COUNTER(cp, CP_BUSY);
        UPDATE_COUNTER(cb, CB_BUSY);
        UPDATE_COUNTER(gui, GUI_ACTIVE);
+       gui_busy = GUI_ACTIVE(value);
 
        if (rscreen->chip_class >= EVERGREEN) {
                /* SRBM_STATUS2 */
                rscreen->ws->read_registers(rscreen->ws, SRBM_STATUS2, 1, &value);
 
                UPDATE_COUNTER(sdma, SDMA_BUSY);
+               sdma_busy = SDMA_BUSY(value);
        }
 
        if (rscreen->chip_class >= VI) {
@@ -120,6 +125,9 @@ static void r600_update_mmio_counters(struct r600_common_screen *rscreen,
                UPDATE_COUNTER(scratch_ram, SCRATCH_RAM_BUSY);
                UPDATE_COUNTER(ce, CE_BUSY);
        }
+
+       value = gui_busy || sdma_busy;
+       UPDATE_COUNTER(gpu, IDENTITY);
 }
 
 #undef UPDATE_COUNTER
@@ -216,7 +224,7 @@ static unsigned busy_index_from_type(struct r600_common_screen *rscreen,
 {
        switch (type) {
        case R600_QUERY_GPU_LOAD:
-               return BUSY_INDEX(rscreen, gui);
+               return BUSY_INDEX(rscreen, gpu);
        case R600_QUERY_GPU_SHADERS_BUSY:
                return BUSY_INDEX(rscreen, spi);
        case R600_QUERY_GPU_TA_BUSY:

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index a01351c93bc1c21675b79e4fd82b162b1fde9e2b..1fe44d9dd84e4a983c7988627667a15481a46319 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -359,6 +359,9 @@ struct r600_mmio_counter {
 
 union r600_mmio_counters {
        struct {
+               /* For global GPU load including SDMA. */
+               struct r600_mmio_counter gpu;
+
                /* GRBM_STATUS */
                struct r600_mmio_counter spi;
                struct r600_mmio_counter gui;