X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_radeon_winsys.h;h=da410e5ef6337e99a0bd8578e9483a21f7503b0a;hp=66a2bcccb4df8e1329146031d4219ae99acaf37a;hb=55d8022878fd11093c861a6386734f88454f21b1;hpb=201b3b8d0d2359f56d8797867f59047cce5d160d diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index 66a2bcccb4d..da410e5ef63 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -29,22 +29,26 @@ #ifndef RADV_RADEON_WINSYS_H #define RADV_RADEON_WINSYS_H +#include #include #include #include -#include "main/macros.h" +#include +#include #include "amd_family.h" +#include "util/u_memory.h" +#include "util/u_math.h" struct radeon_info; struct ac_surf_info; struct radeon_surf; -#define FREE(x) free(x) - enum radeon_bo_domain { /* bitfield */ RADEON_DOMAIN_GTT = 2, RADEON_DOMAIN_VRAM = 4, - RADEON_DOMAIN_VRAM_GTT = RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT + RADEON_DOMAIN_VRAM_GTT = RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT, + RADEON_DOMAIN_GDS = 8, + RADEON_DOMAIN_OA = 16, }; enum radeon_bo_flag { /* bitfield */ @@ -55,6 +59,10 @@ enum radeon_bo_flag { /* bitfield */ RADEON_FLAG_VA_UNCACHED = (1 << 4), RADEON_FLAG_IMPLICIT_SYNC = (1 << 5), RADEON_FLAG_NO_INTERPROCESS_SHARING = (1 << 6), + RADEON_FLAG_READ_ONLY = (1 << 7), + RADEON_FLAG_32BIT = (1 << 8), + RADEON_FLAG_PREFER_LOCAL_BO = (1 << 9), + RADEON_FLAG_ZERO_VRAM = (1 << 10), }; enum radeon_bo_usage { /* bitfield */ @@ -63,15 +71,6 @@ enum radeon_bo_usage { /* bitfield */ RADEON_USAGE_READWRITE = RADEON_USAGE_READ | RADEON_USAGE_WRITE }; -enum ring_type { - RING_GFX = 0, - RING_COMPUTE, - RING_DMA, - RING_UVD, - RING_VCE, - RING_LAST, -}; - enum radeon_ctx_priority { RADEON_CTX_PRIORITY_INVALID = -1, RADEON_CTX_PRIORITY_LOW = 0, @@ -80,7 +79,23 @@ enum radeon_ctx_priority { RADEON_CTX_PRIORITY_REALTIME, }; -struct radeon_winsys_cs { +enum radeon_value_id { + RADEON_ALLOCATED_VRAM, + RADEON_ALLOCATED_VRAM_VIS, + RADEON_ALLOCATED_GTT, + RADEON_TIMESTAMP, + RADEON_NUM_BYTES_MOVED, + RADEON_NUM_EVICTIONS, + RADEON_NUM_VRAM_CPU_PAGE_FAULTS, + RADEON_VRAM_USAGE, + RADEON_VRAM_VIS_USAGE, + RADEON_GTT_USAGE, + RADEON_GPU_TEMPERATURE, + RADEON_CURRENT_SCLK, + RADEON_CURRENT_MCLK, +}; + +struct radeon_cmdbuf { unsigned cdw; /* Number of used dwords. */ unsigned max_dw; /* Maximum number of dwords. */ uint32_t *buf; /* The base pointer of the chunk. */ @@ -131,6 +146,7 @@ struct radeon_bo_metadata { struct { /* surface flags */ unsigned swizzle_mode:5; + bool scanout; } gfx9; } u; @@ -142,17 +158,21 @@ struct radeon_bo_metadata { uint32_t metadata[64]; }; -uint32_t syncobj_handle; struct radeon_winsys_fence; +struct radeon_winsys_ctx; struct radeon_winsys_bo { uint64_t va; bool is_local; + bool vram_no_cpu_access; }; struct radv_winsys_sem_counts { uint32_t syncobj_count; + uint32_t syncobj_reset_count; /* for wait only, whether to reset the syncobj */ + uint32_t timeline_syncobj_count; uint32_t sem_count; uint32_t *syncobj; + uint64_t *points; struct radeon_winsys_sem **sem; }; @@ -163,12 +183,41 @@ struct radv_winsys_sem_info { struct radv_winsys_sem_counts signal; }; +struct radv_winsys_bo_list { + struct radeon_winsys_bo **bos; + unsigned count; +}; + +/* Kernel effectively allows 0-31. This sets some priorities for fixed + * functionality buffers */ +enum { + RADV_BO_PRIORITY_APPLICATION_MAX = 28, + + /* virtual buffers have 0 priority since the priority is not used. */ + RADV_BO_PRIORITY_VIRTUAL = 0, + + /* This should be considerably lower than most of the stuff below, + * but how much lower is hard to say since we don't know application + * assignments. Put it pretty high since it is GTT anyway. */ + RADV_BO_PRIORITY_QUERY_POOL = 29, + + RADV_BO_PRIORITY_DESCRIPTOR = 30, + RADV_BO_PRIORITY_UPLOAD_BUFFER = 30, + RADV_BO_PRIORITY_FENCE = 30, + RADV_BO_PRIORITY_SHADER = 31, + RADV_BO_PRIORITY_SCRATCH = 31, + RADV_BO_PRIORITY_CS = 31, +}; + struct radeon_winsys { void (*destroy)(struct radeon_winsys *ws); void (*query_info)(struct radeon_winsys *ws, struct radeon_info *info); + uint64_t (*query_value)(struct radeon_winsys *ws, + enum radeon_value_id value); + bool (*read_registers)(struct radeon_winsys *ws, unsigned reg_offset, unsigned num_registers, uint32_t *out); @@ -178,97 +227,130 @@ struct radeon_winsys { uint64_t size, unsigned alignment, enum radeon_bo_domain domain, - enum radeon_bo_flag flags); + enum radeon_bo_flag flags, + unsigned priority); void (*buffer_destroy)(struct radeon_winsys_bo *bo); void *(*buffer_map)(struct radeon_winsys_bo *bo); + struct radeon_winsys_bo *(*buffer_from_ptr)(struct radeon_winsys *ws, + void *pointer, + uint64_t size, + unsigned priority); + struct radeon_winsys_bo *(*buffer_from_fd)(struct radeon_winsys *ws, int fd, - unsigned *stride, unsigned *offset); + unsigned priority, + uint64_t *alloc_size); bool (*buffer_get_fd)(struct radeon_winsys *ws, struct radeon_winsys_bo *bo, int *fd); + bool (*buffer_get_flags_from_fd)(struct radeon_winsys *ws, int fd, + enum radeon_bo_domain *domains, + enum radeon_bo_flag *flags); + void (*buffer_unmap)(struct radeon_winsys_bo *bo); void (*buffer_set_metadata)(struct radeon_winsys_bo *bo, struct radeon_bo_metadata *md); + void (*buffer_get_metadata)(struct radeon_winsys_bo *bo, + struct radeon_bo_metadata *md); - void (*buffer_virtual_bind)(struct radeon_winsys_bo *parent, - uint64_t offset, uint64_t size, - struct radeon_winsys_bo *bo, uint64_t bo_offset); - struct radeon_winsys_ctx *(*ctx_create)(struct radeon_winsys *ws, - enum radeon_ctx_priority priority); + VkResult (*buffer_virtual_bind)(struct radeon_winsys_bo *parent, + uint64_t offset, uint64_t size, + struct radeon_winsys_bo *bo, uint64_t bo_offset); + VkResult (*ctx_create)(struct radeon_winsys *ws, + enum radeon_ctx_priority priority, + struct radeon_winsys_ctx **ctx); void (*ctx_destroy)(struct radeon_winsys_ctx *ctx); bool (*ctx_wait_idle)(struct radeon_winsys_ctx *ctx, enum ring_type ring_type, int ring_index); - struct radeon_winsys_cs *(*cs_create)(struct radeon_winsys *ws, + struct radeon_cmdbuf *(*cs_create)(struct radeon_winsys *ws, enum ring_type ring_type); - void (*cs_destroy)(struct radeon_winsys_cs *cs); + void (*cs_destroy)(struct radeon_cmdbuf *cs); - void (*cs_reset)(struct radeon_winsys_cs *cs); + void (*cs_reset)(struct radeon_cmdbuf *cs); - bool (*cs_finalize)(struct radeon_winsys_cs *cs); + VkResult (*cs_finalize)(struct radeon_cmdbuf *cs); - void (*cs_grow)(struct radeon_winsys_cs * cs, size_t min_size); + void (*cs_grow)(struct radeon_cmdbuf * cs, size_t min_size); - int (*cs_submit)(struct radeon_winsys_ctx *ctx, - int queue_index, - struct radeon_winsys_cs **cs_array, - unsigned cs_count, - struct radeon_winsys_cs *initial_preamble_cs, - struct radeon_winsys_cs *continue_preamble_cs, - struct radv_winsys_sem_info *sem_info, - bool can_patch, - struct radeon_winsys_fence *fence); + VkResult (*cs_submit)(struct radeon_winsys_ctx *ctx, + int queue_index, + struct radeon_cmdbuf **cs_array, + unsigned cs_count, + struct radeon_cmdbuf *initial_preamble_cs, + struct radeon_cmdbuf *continue_preamble_cs, + struct radv_winsys_sem_info *sem_info, + const struct radv_winsys_bo_list *bo_list, /* optional */ + bool can_patch, + struct radeon_winsys_fence *fence); - void (*cs_add_buffer)(struct radeon_winsys_cs *cs, - struct radeon_winsys_bo *bo, - uint8_t priority); + void (*cs_add_buffer)(struct radeon_cmdbuf *cs, + struct radeon_winsys_bo *bo); - void (*cs_execute_secondary)(struct radeon_winsys_cs *parent, - struct radeon_winsys_cs *child); + void (*cs_execute_secondary)(struct radeon_cmdbuf *parent, + struct radeon_cmdbuf *child); - void (*cs_dump)(struct radeon_winsys_cs *cs, FILE* file, const int *trace_ids, int trace_id_count); + void (*cs_dump)(struct radeon_cmdbuf *cs, FILE* file, const int *trace_ids, int trace_id_count); int (*surface_init)(struct radeon_winsys *ws, const struct ac_surf_info *surf_info, struct radeon_surf *surf); - int (*surface_best)(struct radeon_winsys *ws, - struct radeon_surf *surf); - struct radeon_winsys_fence *(*create_fence)(); void (*destroy_fence)(struct radeon_winsys_fence *fence); + void (*reset_fence)(struct radeon_winsys_fence *fence); + void (*signal_fence)(struct radeon_winsys_fence *fence); + bool (*is_fence_waitable)(struct radeon_winsys_fence *fence); bool (*fence_wait)(struct radeon_winsys *ws, struct radeon_winsys_fence *fence, bool absolute, uint64_t timeout); + bool (*fences_wait)(struct radeon_winsys *ws, + struct radeon_winsys_fence *const *fences, + uint32_t fence_count, + bool wait_all, + uint64_t timeout); /* old semaphores - non shareable */ struct radeon_winsys_sem *(*create_sem)(struct radeon_winsys *ws); void (*destroy_sem)(struct radeon_winsys_sem *sem); /* new shareable sync objects */ - int (*create_syncobj)(struct radeon_winsys *ws, uint32_t *handle); + int (*create_syncobj)(struct radeon_winsys *ws, bool create_signaled, + uint32_t *handle); void (*destroy_syncobj)(struct radeon_winsys *ws, uint32_t handle); + void (*reset_syncobj)(struct radeon_winsys *ws, uint32_t handle); + void (*signal_syncobj)(struct radeon_winsys *ws, uint32_t handle, uint64_t point); + VkResult (*query_syncobj)(struct radeon_winsys *ws, uint32_t handle, uint64_t *point); + bool (*wait_syncobj)(struct radeon_winsys *ws, const uint32_t *handles, uint32_t handle_count, + bool wait_all, uint64_t timeout); + bool (*wait_timeline_syncobj)(struct radeon_winsys *ws, const uint32_t *handles, const uint64_t *points, + uint32_t handle_count, bool wait_all, bool available, uint64_t timeout); + int (*export_syncobj)(struct radeon_winsys *ws, uint32_t syncobj, int *fd); int (*import_syncobj)(struct radeon_winsys *ws, int fd, uint32_t *syncobj); + int (*export_syncobj_to_sync_file)(struct radeon_winsys *ws, uint32_t syncobj, int *fd); + + /* Note that this, unlike the normal import, uses an existing syncobj. */ + int (*import_syncobj_from_sync_file)(struct radeon_winsys *ws, uint32_t syncobj, int fd); + }; -static inline void radeon_emit(struct radeon_winsys_cs *cs, uint32_t value) +static inline void radeon_emit(struct radeon_cmdbuf *cs, uint32_t value) { cs->buf[cs->cdw++] = value; } -static inline void radeon_emit_array(struct radeon_winsys_cs *cs, +static inline void radeon_emit_array(struct radeon_cmdbuf *cs, const uint32_t *values, unsigned count) { memcpy(cs->buf + cs->cdw, values, count * 4); @@ -281,14 +363,13 @@ static inline uint64_t radv_buffer_get_va(struct radeon_winsys_bo *bo) } static inline void radv_cs_add_buffer(struct radeon_winsys *ws, - struct radeon_winsys_cs *cs, - struct radeon_winsys_bo *bo, - uint8_t priority) + struct radeon_cmdbuf *cs, + struct radeon_winsys_bo *bo) { if (bo->is_local) return; - ws->cs_add_buffer(cs, bo, priority); + ws->cs_add_buffer(cs, bo); } #endif /* RADV_RADEON_WINSYS_H */