From 4bad50ded99229c5c4f2f7e6c213b226cfd00a2c Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Thu, 2 Aug 2018 16:39:41 -0400 Subject: radeonsi: cosmetic changes --- src/gallium/drivers/radeonsi/si_cp_dma.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 2 +- src/gallium/drivers/radeonsi/si_test_clearbuffer.c | 3 +-- src/gallium/drivers/radeonsi/si_test_dma.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index b0133323590..b33feaa11cc 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -215,7 +215,7 @@ static void si_cp_dma_prepare(struct si_context *sctx, struct pipe_resource *dst void si_clear_buffer(struct si_context *sctx, struct pipe_resource *dst, uint64_t offset, uint64_t size, unsigned value, - enum si_coherency coher, enum si_method xfer ) + enum si_coherency coher, enum si_method xfer) { struct radeon_winsys *ws = sctx->ws; struct r600_resource *rdst = r600_resource(dst); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index e9cf1c32724..c1983b86661 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1071,7 +1071,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, si_test_dma(sscreen); if (sscreen->debug_flags & DBG(TEST_CLEARBUF_PERF)) { - si_test_clearbuffer(sscreen); + si_test_clearbuffer_perf(sscreen); } if (sscreen->debug_flags & (DBG(TEST_VMFAULT_CP) | diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 7bfc9f5da1a..2f77cc741bf 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -1206,7 +1206,7 @@ void si_resume_queries(struct si_context *sctx); void si_test_dma(struct si_screen *sscreen); /* si_test_clearbuffer.c */ -void si_test_clearbuffer(struct si_screen *sscreen); +void si_test_clearbuffer_perf(struct si_screen *sscreen); /* si_uvd.c */ struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context, diff --git a/src/gallium/drivers/radeonsi/si_test_clearbuffer.c b/src/gallium/drivers/radeonsi/si_test_clearbuffer.c index 00fbd2d043a..c0696da26db 100644 --- a/src/gallium/drivers/radeonsi/si_test_clearbuffer.c +++ b/src/gallium/drivers/radeonsi/si_test_clearbuffer.c @@ -127,7 +127,7 @@ analyze_clearbuf_perf_rng(struct pipe_context *ctx) } } -void si_test_clearbuffer(struct si_screen *sscreen) +void si_test_clearbuffer_perf(struct si_screen *sscreen) { struct pipe_screen *screen = &sscreen->b; struct pipe_context *ctx = screen->context_create(screen, NULL, 0); @@ -137,4 +137,3 @@ void si_test_clearbuffer(struct si_screen *sscreen) exit(0); } - diff --git a/src/gallium/drivers/radeonsi/si_test_dma.c b/src/gallium/drivers/radeonsi/si_test_dma.c index baab580308a..f125769d1cf 100644 --- a/src/gallium/drivers/radeonsi/si_test_dma.c +++ b/src/gallium/drivers/radeonsi/si_test_dma.c @@ -308,7 +308,7 @@ void si_test_dma(struct si_screen *sscreen) /* clear dst pixels */ si_clear_buffer(sctx, dst, 0, sdst->surface.surf_size, 0, - true, SI_METHOD_BEST); + SI_COHERENCY_SHADER, SI_METHOD_BEST); memset(dst_cpu.ptr, 0, dst_cpu.layer_stride * tdst.array_size); /* preparation */ -- cgit v1.2.3