diff options
| author | Marek Olšák <[email protected]> | 2017-12-01 00:14:51 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-12-05 13:30:34 +0100 |
| commit | cccf09677fbc1fd5c12465620674585f16abf9af (patch) | |
| tree | b4aeaba1c9b92b542e9c1c05a2ea88feec7d6656 | |
| parent | 9ac5504df5c31e60801d9d37c1f3d547c486bf0a (diff) | |
gallium/radeon: remove RADEON_HEAP_VRAM_GTT
Only winsyses can set VRAM|GTT. Drivers shouldn't if they want to use
winsys allocators.
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 7ab110a4cfd..1d59b282882 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -654,7 +654,6 @@ static inline void radeon_emit_array(struct radeon_winsys_cs *cs, enum radeon_heap { RADEON_HEAP_VRAM_NO_CPU_ACCESS, RADEON_HEAP_VRAM, - RADEON_HEAP_VRAM_GTT, /* combined heaps */ RADEON_HEAP_GTT_WC, RADEON_HEAP_GTT, RADEON_MAX_SLAB_HEAPS, @@ -667,8 +666,6 @@ static inline enum radeon_bo_domain radeon_domain_from_heap(enum radeon_heap hea case RADEON_HEAP_VRAM_NO_CPU_ACCESS: case RADEON_HEAP_VRAM: return RADEON_DOMAIN_VRAM; - case RADEON_HEAP_VRAM_GTT: - return RADEON_DOMAIN_VRAM_GTT; case RADEON_HEAP_GTT_WC: case RADEON_HEAP_GTT: return RADEON_DOMAIN_GTT; @@ -687,7 +684,6 @@ static inline unsigned radeon_flags_from_heap(enum radeon_heap heap) RADEON_FLAG_NO_INTERPROCESS_SHARING; case RADEON_HEAP_VRAM: - case RADEON_HEAP_VRAM_GTT: case RADEON_HEAP_GTT_WC: return RADEON_FLAG_GTT_WC | RADEON_FLAG_NO_INTERPROCESS_SHARING; @@ -707,7 +703,6 @@ static inline unsigned radeon_get_pb_cache_bucket_index(enum radeon_heap heap) case RADEON_HEAP_VRAM_NO_CPU_ACCESS: return 0; case RADEON_HEAP_VRAM: - case RADEON_HEAP_VRAM_GTT: return 1; case RADEON_HEAP_GTT_WC: return 2; @@ -742,15 +737,14 @@ static inline int radeon_get_heap_index(enum radeon_bo_domain domain, return RADEON_HEAP_VRAM_NO_CPU_ACCESS; else return RADEON_HEAP_VRAM; - case RADEON_DOMAIN_VRAM_GTT: - return RADEON_HEAP_VRAM_GTT; case RADEON_DOMAIN_GTT: if (flags & RADEON_FLAG_GTT_WC) return RADEON_HEAP_GTT_WC; else return RADEON_HEAP_GTT; + default: + return -1; } - return -1; } #endif |