diff options
author | Dave Airlie <[email protected]> | 2017-10-09 13:30:02 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2017-10-10 06:08:42 +1000 |
commit | bee61d16c8c48b0339d1db9bf4e6bf1ddc6685ff (patch) | |
tree | fa51b02ec2d7598d1ee7457ac75575dd9254afd6 /src/gallium/drivers/r600/r600_gpu_load.c | |
parent | 7b697c8b7865e9ca6be6bc445801928d7ae7169c (diff) |
r600: drop a bunch of post-cayman code. (v2)
Now that Marek has split the two drivers apart, drop a bunch
of unnecessary code from the r600 half. There is probably a bunch
more hiding in the video code.
No piglit regressions on caicos.
v2: fix HAVE_LLVM protected code
Acked-by: Nicolai Hähnle <[email protected]>
Acked-by: Marek Olšák <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_gpu_load.c')
-rw-r--r-- | src/gallium/drivers/r600/r600_gpu_load.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gallium/drivers/r600/r600_gpu_load.c b/src/gallium/drivers/r600/r600_gpu_load.c index d35be4f327a..c15fb9dfa06 100644 --- a/src/gallium/drivers/r600/r600_gpu_load.c +++ b/src/gallium/drivers/r600/r600_gpu_load.c @@ -104,26 +104,6 @@ static void r600_update_mmio_counters(struct r600_common_screen *rscreen, UPDATE_COUNTER(gui, GUI_ACTIVE); gui_busy = GUI_ACTIVE(value); - if (rscreen->chip_class == CIK || rscreen->chip_class == VI) { - /* 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) { - /* 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(cp_dma, DMA_BUSY); - UPDATE_COUNTER(scratch_ram, SCRATCH_RAM_BUSY); - } - value = gui_busy || sdma_busy; UPDATE_COUNTER(gpu, IDENTITY); } |