diff options
| author | Marek Olšák <[email protected]> | 2017-06-29 17:09:04 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-07-04 15:40:37 +0200 |
| commit | b09a22ad21a1a7b222aa67eb86aaf02bf8fd6d34 (patch) | |
| tree | c122416718162cb2162859f354d58084605c5371 /src/gallium/drivers/radeon | |
| parent | 03c5ef195df4972d864d84c0ffaf917505afc13d (diff) | |
gallium/radeon: remove RADEON_FLAG_CPU_ACCESS
https://lists.freedesktop.org/archives/amd-gfx/2017-June/010591.html
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 342695c1387..262fe1db836 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -132,7 +132,6 @@ void r600_init_resource_fields(struct r600_common_screen *rscreen, res->flags |= RADEON_FLAG_GTT_WC; break; } - res->flags |= RADEON_FLAG_CPU_ACCESS; /* fall through */ case PIPE_USAGE_DEFAULT: case PIPE_USAGE_IMMUTABLE: @@ -158,15 +157,12 @@ void r600_init_resource_fields(struct r600_common_screen *rscreen, if (rscreen->info.drm_major == 2 && rscreen->info.drm_minor < 40) res->domains = RADEON_DOMAIN_GTT; - else if (res->domains & RADEON_DOMAIN_VRAM) - res->flags |= RADEON_FLAG_CPU_ACCESS; } /* Tiled textures are unmappable. Always put them in VRAM. */ if ((res->b.b.target != PIPE_BUFFER && !rtex->surface.is_linear) || res->flags & R600_RESOURCE_FLAG_UNMAPPABLE) { res->domains = RADEON_DOMAIN_VRAM; - res->flags &= ~RADEON_FLAG_CPU_ACCESS; res->flags |= RADEON_FLAG_NO_CPU_ACCESS | RADEON_FLAG_GTT_WC; } diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 706188f24d0..1be94f71e8b 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -51,10 +51,9 @@ enum radeon_bo_domain { /* bitfield */ enum radeon_bo_flag { /* bitfield */ RADEON_FLAG_GTT_WC = (1 << 0), - RADEON_FLAG_CPU_ACCESS = (1 << 1), - RADEON_FLAG_NO_CPU_ACCESS = (1 << 2), - RADEON_FLAG_NO_SUBALLOC = (1 << 3), - RADEON_FLAG_SPARSE = (1 << 4), + RADEON_FLAG_NO_CPU_ACCESS = (1 << 1), + RADEON_FLAG_NO_SUBALLOC = (1 << 2), + RADEON_FLAG_SPARSE = (1 << 3), }; enum radeon_bo_usage { /* bitfield */ |