X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_bufmgr.h;h=a11599ff79bf5ad028f49e40e825a7b785495734;hb=bc17155fd0e6cb3ec0a19ffbe39f0c981ef48d4f;hp=487abe162b3b7e0b7c7642a86b5afd50b9d7ab11;hpb=0314eed3b12b55a921530c0ba5656c8c7ea27404;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h index 487abe162b3..a11599ff79b 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.h +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h @@ -37,57 +37,97 @@ #include #include #include +#include "util/list.h" #if defined(__cplusplus) extern "C" { #endif struct gen_device_info; - -typedef struct _drm_bacon_bufmgr drm_bacon_bufmgr; -typedef struct _drm_bacon_context drm_bacon_context; -typedef struct _drm_bacon_bo drm_bacon_bo; - -struct _drm_bacon_bo { - /** - * Size in bytes of the buffer object. - * - * The size may be larger than the size originally requested for the - * allocation, such as being aligned to page size. - */ - unsigned long size; - - /** - * Alignment requirement for object - * - * Used for GTT mapping & pinning the object. - */ - unsigned long align; - - /** - * Virtual address for accessing the buffer data. Only valid while - * mapped. - */ -#ifdef __cplusplus - void *virt; -#else - void *virtual; +struct brw_context; + +struct brw_bo { + /** + * Size in bytes of the buffer object. + * + * The size may be larger than the size originally requested for the + * allocation, such as being aligned to page size. + */ + uint64_t size; + + /** + * Alignment requirement for object + * + * Used for GTT mapping & pinning the object. + */ + uint64_t align; + + /** Buffer manager context associated with this buffer object */ + struct brw_bufmgr *bufmgr; + + /** The GEM handle for this buffer object. */ + uint32_t gem_handle; + + /** + * Last seen card virtual address (offset from the beginning of the + * aperture) for the object. This should be used to fill relocation + * entries when calling brw_bo_emit_reloc() + */ + uint64_t offset64; + + /** + * Boolean of whether the GPU is definitely not accessing the buffer. + * + * This is only valid when reusable, since non-reusable + * buffers are those that have been shared with other + * processes, so we don't know their state. + */ + bool idle; + + int refcount; + const char *name; + +#ifndef EXEC_OBJECT_CAPTURE +#define EXEC_OBJECT_CAPTURE (1<<7) #endif - - /** Buffer manager context associated with this buffer object */ - drm_bacon_bufmgr *bufmgr; - - /** - * MM-specific handle for accessing object - */ - int handle; - - /** - * Last seen card virtual address (offset from the beginning of the - * aperture) for the object. This should be used to fill relocation - * entries when calling drm_bacon_bo_emit_reloc() - */ - uint64_t offset64; + uint64_t kflags; + + /** + * Kenel-assigned global name for this object + * + * List contains both flink named and prime fd'd objects + */ + unsigned int global_name; + + /** + * Current tiling mode + */ + uint32_t tiling_mode; + uint32_t swizzle_mode; + uint32_t stride; + + time_t free_time; + + /** Mapped address for the buffer, saved across map/unmap cycles */ + void *map_cpu; + /** GTT virtual address for the buffer, saved across map/unmap cycles */ + void *map_gtt; + /** WC CPU address for the buffer, saved across map/unmap cycles */ + void *map_wc; + int map_count; + + /** BO cache list */ + struct list_head head; + + /** + * Boolean of whether this buffer can be re-used + */ + bool reusable; + + /** + * Boolean of whether this buffer is cache coherent + */ + bool cache_coherent; }; #define BO_ALLOC_FOR_RENDER (1<<0) @@ -97,20 +137,10 @@ struct _drm_bacon_bo { * * Buffer objects are not necessarily initially mapped into CPU virtual * address space or graphics device aperture. They must be mapped - * using bo_map() or drm_bacon_gem_bo_map_gtt() to be used by the CPU. - */ -drm_bacon_bo *drm_bacon_bo_alloc(drm_bacon_bufmgr *bufmgr, const char *name, - unsigned long size, unsigned int alignment); -/** - * Allocate a buffer object, hinting that it will be used as a - * render target. - * - * This is otherwise the same as bo_alloc. + * using brw_bo_map() to be used by the CPU. */ -drm_bacon_bo *drm_bacon_bo_alloc_for_render(drm_bacon_bufmgr *bufmgr, - const char *name, - unsigned long size, - unsigned int alignment); +struct brw_bo *brw_bo_alloc(struct brw_bufmgr *bufmgr, const char *name, + uint64_t size, uint64_t alignment); /** * Allocate a tiled buffer object. @@ -127,43 +157,52 @@ drm_bacon_bo *drm_bacon_bo_alloc_for_render(drm_bacon_bufmgr *bufmgr, * 'tiling_mode' field on return, as well as the pitch value, which * may have been rounded up to accommodate for tiling restrictions. */ -drm_bacon_bo *drm_bacon_bo_alloc_tiled(drm_bacon_bufmgr *bufmgr, - const char *name, - int x, int y, int cpp, - uint32_t *tiling_mode, - unsigned long *pitch, - unsigned long flags); +struct brw_bo *brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, + const char *name, + int x, int y, int cpp, + uint32_t tiling_mode, + uint32_t *pitch, + unsigned flags); /** Takes a reference on a buffer object */ -void drm_bacon_bo_reference(drm_bacon_bo *bo); +void brw_bo_reference(struct brw_bo *bo); /** * Releases a reference on a buffer object, freeing the data if * no references remain. */ -void drm_bacon_bo_unreference(drm_bacon_bo *bo); +void brw_bo_unreference(struct brw_bo *bo); + +/* Must match MapBufferRange interface (for convenience) */ +#define MAP_READ GL_MAP_READ_BIT +#define MAP_WRITE GL_MAP_WRITE_BIT +#define MAP_ASYNC GL_MAP_UNSYNCHRONIZED_BIT +#define MAP_PERSISTENT GL_MAP_PERSISTENT_BIT +#define MAP_COHERENT GL_MAP_COHERENT_BIT +/* internal */ +#define MAP_INTERNAL_MASK (0xff << 24) +#define MAP_RAW (0x01 << 24) /** * Maps the buffer into userspace. * * This function will block waiting for any existing execution on the - * buffer to complete, first. The resulting mapping is available at - * buf->virtual. + * buffer to complete, first. The resulting mapping is returned. */ -int drm_bacon_bo_map(drm_bacon_bo *bo, int write_enable); +MUST_CHECK void *brw_bo_map(struct brw_context *brw, struct brw_bo *bo, unsigned flags); /** * Reduces the refcount on the userspace mapping of the buffer * object. */ -int drm_bacon_bo_unmap(drm_bacon_bo *bo); +int brw_bo_unmap(struct brw_bo *bo); /** Write data into an object. */ -int drm_bacon_bo_subdata(drm_bacon_bo *bo, unsigned long offset, - unsigned long size, const void *data); +int brw_bo_subdata(struct brw_bo *bo, uint64_t offset, + uint64_t size, const void *data); /** Read data from an object. */ -int drm_bacon_bo_get_subdata(drm_bacon_bo *bo, unsigned long offset, - unsigned long size, void *data); +int brw_bo_get_subdata(struct brw_bo *bo, uint64_t offset, + uint64_t size, void *data); /** * Waits for rendering to an object by the GPU to have completed. * @@ -171,52 +210,13 @@ int drm_bacon_bo_get_subdata(drm_bacon_bo *bo, unsigned long offset, * bo_subdata, etc. It is merely a way for the driver to implement * glFinish. */ -void drm_bacon_bo_wait_rendering(drm_bacon_bo *bo); +void brw_bo_wait_rendering(struct brw_context *brw, struct brw_bo *bo); /** * Tears down the buffer manager instance. */ -void drm_bacon_bufmgr_destroy(drm_bacon_bufmgr *bufmgr); - -/** Executes the command buffer pointed to by bo. */ -int drm_bacon_bo_exec(drm_bacon_bo *bo, int used); - -/** Executes the command buffer pointed to by bo on the selected ring buffer */ -int drm_bacon_bo_mrb_exec(drm_bacon_bo *bo, int used, unsigned int flags); -int drm_bacon_bufmgr_check_aperture_space(drm_bacon_bo ** bo_array, int count); - -/** - * Add relocation entry in reloc_buf, which will be updated with the - * target buffer's real offset on on command submission. - * - * Relocations remain in place for the lifetime of the buffer object. - * - * \param bo Buffer to write the relocation into. - * \param offset Byte offset within reloc_bo of the pointer to - * target_bo. - * \param target_bo Buffer whose offset should be written into the - * relocation entry. - * \param target_offset Constant value to be added to target_bo's - * offset in relocation entry. - * \param read_domains GEM read domains which the buffer will be - * read into by the command that this relocation - * is part of. - * \param write_domains GEM read domains which the buffer will be - * dirtied in by the command that this - * relocation is part of. - */ -int drm_bacon_bo_emit_reloc(drm_bacon_bo *bo, uint32_t offset, - drm_bacon_bo *target_bo, uint32_t target_offset, - uint32_t read_domains, uint32_t write_domain); +void brw_bufmgr_destroy(struct brw_bufmgr *bufmgr); -/** - * Ask that the buffer be placed in tiling mode - * - * \param buf Buffer to set tiling mode for - * \param tiling_mode desired, and returned tiling mode - */ -int drm_bacon_bo_set_tiling(drm_bacon_bo *bo, uint32_t * tiling_mode, - uint32_t stride); /** * Get the current tiling (and resulting swizzling) mode for the bo. * @@ -224,8 +224,8 @@ int drm_bacon_bo_set_tiling(drm_bacon_bo *bo, uint32_t * tiling_mode, * \param tiling_mode returned tiling mode * \param swizzle_mode returned swizzling mode */ -int drm_bacon_bo_get_tiling(drm_bacon_bo *bo, uint32_t * tiling_mode, - uint32_t * swizzle_mode); +int brw_bo_get_tiling(struct brw_bo *bo, uint32_t *tiling_mode, + uint32_t *swizzle_mode); /** * Create a visible name for a buffer which can be used by other apps @@ -233,13 +233,13 @@ int drm_bacon_bo_get_tiling(drm_bacon_bo *bo, uint32_t * tiling_mode, * \param buf Buffer to create a name for * \param name Returned name */ -int drm_bacon_bo_flink(drm_bacon_bo *bo, uint32_t * name); +int brw_bo_flink(struct brw_bo *bo, uint32_t *name); /** * Returns 1 if mapping the buffer for write could cause the process * to block, due to the object being active in the GPU. */ -int drm_bacon_bo_busy(drm_bacon_bo *bo); +int brw_bo_busy(struct brw_bo *bo); /** * Specify the volatility of the buffer. @@ -253,91 +253,31 @@ int drm_bacon_bo_busy(drm_bacon_bo *bo); * Returns 1 if the buffer was retained, or 0 if it was discarded whilst * marked as I915_MADV_DONTNEED. */ -int drm_bacon_bo_madvise(drm_bacon_bo *bo, int madv); +int brw_bo_madvise(struct brw_bo *bo, int madv); -/** - * Set the offset at which this buffer will be softpinned - * \param bo Buffer to set the softpin offset for - * \param offset Softpin offset - */ -int drm_bacon_bo_set_softpin_offset(drm_bacon_bo *bo, uint64_t offset); +/* drm_bacon_bufmgr_gem.c */ +struct brw_bufmgr *brw_bufmgr_init(struct gen_device_info *devinfo, + int fd, int batch_size); +struct brw_bo *brw_bo_gem_create_from_name(struct brw_bufmgr *bufmgr, + const char *name, + unsigned int handle); +void brw_bufmgr_enable_reuse(struct brw_bufmgr *bufmgr); -/** - * Disable buffer reuse for buffers which will be shared in some way, - * as with scanout buffers. When the buffer reference count goes to - * zero, it will be freed and not placed in the reuse list. - * - * \param bo Buffer to disable reuse for - */ -int drm_bacon_bo_disable_reuse(drm_bacon_bo *bo); +int brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns); -/** - * Query whether a buffer is reusable. - * - * \param bo Buffer to query - */ -int drm_bacon_bo_is_reusable(drm_bacon_bo *bo); +uint32_t brw_create_hw_context(struct brw_bufmgr *bufmgr); +void brw_destroy_hw_context(struct brw_bufmgr *bufmgr, uint32_t ctx_id); -/** Returns true if target_bo is in the relocation tree rooted at bo. */ -int drm_bacon_bo_references(drm_bacon_bo *bo, drm_bacon_bo *target_bo); +int brw_bo_gem_export_to_prime(struct brw_bo *bo, int *prime_fd); +struct brw_bo *brw_bo_gem_create_from_prime(struct brw_bufmgr *bufmgr, + int prime_fd, int size); -/* drm_bacon_bufmgr_gem.c */ -drm_bacon_bufmgr *drm_bacon_bufmgr_gem_init(struct gen_device_info *devinfo, - int fd, int batch_size); -drm_bacon_bo *drm_bacon_bo_gem_create_from_name(drm_bacon_bufmgr *bufmgr, - const char *name, - unsigned int handle); -void drm_bacon_bufmgr_gem_enable_reuse(drm_bacon_bufmgr *bufmgr); -void drm_bacon_bufmgr_gem_set_vma_cache_size(drm_bacon_bufmgr *bufmgr, - int limit); -int drm_bacon_gem_bo_map_unsynchronized(drm_bacon_bo *bo); -int drm_bacon_gem_bo_map_gtt(drm_bacon_bo *bo); - -#define HAVE_DRM_INTEL_GEM_BO_DISABLE_IMPLICIT_SYNC 1 -int drm_bacon_bufmgr_gem_can_disable_implicit_sync(drm_bacon_bufmgr *bufmgr); -void drm_bacon_gem_bo_disable_implicit_sync(drm_bacon_bo *bo); -void drm_bacon_gem_bo_enable_implicit_sync(drm_bacon_bo *bo); - -void *drm_bacon_gem_bo_map__cpu(drm_bacon_bo *bo); -void *drm_bacon_gem_bo_map__gtt(drm_bacon_bo *bo); -void *drm_bacon_gem_bo_map__wc(drm_bacon_bo *bo); - -int drm_bacon_gem_bo_get_reloc_count(drm_bacon_bo *bo); -void drm_bacon_gem_bo_clear_relocs(drm_bacon_bo *bo, int start); -void drm_bacon_gem_bo_start_gtt_access(drm_bacon_bo *bo, int write_enable); - -int drm_bacon_gem_bo_wait(drm_bacon_bo *bo, int64_t timeout_ns); - -drm_bacon_context *drm_bacon_gem_context_create(drm_bacon_bufmgr *bufmgr); -int drm_bacon_gem_context_get_id(drm_bacon_context *ctx, - uint32_t *ctx_id); -void drm_bacon_gem_context_destroy(drm_bacon_context *ctx); -int drm_bacon_gem_bo_context_exec(drm_bacon_bo *bo, drm_bacon_context *ctx, - int used, unsigned int flags); -int drm_bacon_gem_bo_fence_exec(drm_bacon_bo *bo, - drm_bacon_context *ctx, - int used, - int in_fence, - int *out_fence, - unsigned int flags); - -int drm_bacon_bo_gem_export_to_prime(drm_bacon_bo *bo, int *prime_fd); -drm_bacon_bo *drm_bacon_bo_gem_create_from_prime(drm_bacon_bufmgr *bufmgr, - int prime_fd, int size); - -int drm_bacon_reg_read(drm_bacon_bufmgr *bufmgr, - uint32_t offset, - uint64_t *result); - -int drm_bacon_get_reset_stats(drm_bacon_context *ctx, - uint32_t *reset_count, - uint32_t *active, - uint32_t *pending); +int brw_reg_read(struct brw_bufmgr *bufmgr, uint32_t offset, + uint64_t *result); /** @{ */ #if defined(__cplusplus) } #endif - #endif /* INTEL_BUFMGR_H */