diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-03-19 18:42:32 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2018-04-02 13:10:37 -0400 |
| commit | a0a96819e1973d5af0ee33af0d62ea3b904e92d4 (patch) | |
| tree | dcd56a78628d5229cdf4c4679802467338922002 /src/gallium/drivers/r600 | |
| parent | 32b3932de1ce2a3987854d3c5275295b7dea0dc6 (diff) | |
ac/gpu_info: rename has_virtual_memory -> r600_has_virtual_memory
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_buffer_common.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_cs.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe_common.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_buffer_common.c b/src/gallium/drivers/r600/r600_buffer_common.c index ca19af9b2ef..17a8c3a596f 100644 --- a/src/gallium/drivers/r600/r600_buffer_common.c +++ b/src/gallium/drivers/r600/r600_buffer_common.c @@ -206,7 +206,7 @@ bool r600_alloc_resource(struct r600_common_screen *rscreen, old_buf = res->buf; res->buf = new_buf; /* should be atomic */ - if (rscreen->info.has_virtual_memory) + if (rscreen->info.r600_has_virtual_memory) res->gpu_address = rscreen->ws->buffer_get_virtual_address(res->buf); else res->gpu_address = 0; @@ -654,7 +654,7 @@ r600_buffer_from_user_memory(struct pipe_screen *screen, return NULL; } - if (rscreen->info.has_virtual_memory) + if (rscreen->info.r600_has_virtual_memory) rbuffer->gpu_address = ws->buffer_get_virtual_address(rbuffer->buf); else diff --git a/src/gallium/drivers/r600/r600_cs.h b/src/gallium/drivers/r600/r600_cs.h index 9c8298a846d..632c7f5f944 100644 --- a/src/gallium/drivers/r600/r600_cs.h +++ b/src/gallium/drivers/r600/r600_cs.h @@ -119,7 +119,7 @@ static inline void r600_emit_reloc(struct r600_common_context *rctx, enum radeon_bo_priority priority) { struct radeon_winsys_cs *cs = ring->cs; - bool has_vm = ((struct r600_common_screen*)rctx->b.screen)->info.has_virtual_memory; + bool has_vm = ((struct r600_common_screen*)rctx->b.screen)->info.r600_has_virtual_memory; unsigned reloc = radeon_add_to_buffer_list(rctx, ring, rbo, usage, priority); if (!has_vm) { diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index 026e8dc9868..255a1e01b7f 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -127,7 +127,7 @@ unsigned r600_gfx_write_fence_dwords(struct r600_common_screen *screen) { unsigned dwords = 6; - if (!screen->info.has_virtual_memory) + if (!screen->info.r600_has_virtual_memory) dwords += 2; return dwords; @@ -311,7 +311,7 @@ void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw, /* If GPUVM is not supported, the CS checker needs 2 entries * in the buffer list per packet, which has to be done manually. */ - if (ctx->screen->info.has_virtual_memory) { + if (ctx->screen->info.r600_has_virtual_memory) { if (dst) radeon_add_to_buffer_list(ctx, &ctx->dma, dst, RADEON_USAGE_WRITE, @@ -1356,7 +1356,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, (int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024)); printf("min_alloc_size = %u\n", rscreen->info.min_alloc_size); printf("has_dedicated_vram = %u\n", rscreen->info.has_dedicated_vram); - printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory); + printf("r600_has_virtual_memory = %i\n", rscreen->info.r600_has_virtual_memory); printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2); printf("has_hw_decode = %u\n", rscreen->info.has_hw_decode); printf("num_sdma_rings = %i\n", rscreen->info.num_sdma_rings); |