i965/drm: Devirtualize the bufmgr.

libdrm_bacon used to have a GEM-based bufmgr and a legacy fake bufmgr,
but that's long since dead (and we never imported it to i965).  So,
drop the extra layer of function pointers.

Reviewed-by: Chris Wilson <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>

1 files changed, 0 insertions, 235 deletions

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
index 6bc6c0b8e11..9f54606e5d1 100644
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
@@ -40,241 +40,6 @@
  * Contains public methods followed by private storage for the buffer manager.
  */
 struct _drm_bacon_bufmgr {
-	/**
-	 * Allocate a buffer object.
-	 *
-	 * 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 *(*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.
-	 */
-	drm_bacon_bo *(*bo_alloc_for_render) (drm_bacon_bufmgr *bufmgr,
-					      const char *name,
-					      unsigned long size,
-					      unsigned int alignment);
-
-	/**
-	 * Allocate a buffer object from an existing user accessible
-	 * address malloc'd with the provided size.
-	 * Alignment is used when mapping to the gtt.
-	 * Flags may be I915_VMAP_READ_ONLY or I915_USERPTR_UNSYNCHRONIZED
-	 */
-	drm_bacon_bo *(*bo_alloc_userptr)(drm_bacon_bufmgr *bufmgr,
-					  const char *name, void *addr,
-					  uint32_t tiling_mode, uint32_t stride,
-					  unsigned long size,
-					  unsigned long flags);
-
-	/**
-	 * Allocate a tiled buffer object.
-	 *
-	 * Alignment for tiled objects is set automatically; the 'flags'
-	 * argument provides a hint about how the object will be used initially.
-	 *
-	 * Valid tiling formats are:
-	 *  I915_TILING_NONE
-	 *  I915_TILING_X
-	 *  I915_TILING_Y
-	 *
-	 * Note the tiling format may be rejected; callers should check the
-	 * '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 *(*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);
-
-	/** Takes a reference on a buffer object */
-	void (*bo_reference) (drm_bacon_bo *bo);
-
-	/**
-	 * Releases a reference on a buffer object, freeing the data if
-	 * no references remain.
-	 */
-	void (*bo_unreference) (drm_bacon_bo *bo);
-
-	/**
-	 * 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.
-	 */
-	int (*bo_map) (drm_bacon_bo *bo, int write_enable);
-
-	/**
-	 * Reduces the refcount on the userspace mapping of the buffer
-	 * object.
-	 */
-	int (*bo_unmap) (drm_bacon_bo *bo);
-
-	/**
-	 * Write data into an object.
-	 *
-	 * This is an optional function, if missing,
-	 * drm_bacon_bo will map/memcpy/unmap.
-	 */
-	int (*bo_subdata) (drm_bacon_bo *bo, unsigned long offset,
-			   unsigned long size, const void *data);
-
-	/**
-	 * Read data from an object
-	 *
-	 * This is an optional function, if missing,
-	 * drm_bacon_bo will map/memcpy/unmap.
-	 */
-	int (*bo_get_subdata) (drm_bacon_bo *bo, unsigned long offset,
-			       unsigned long size, void *data);
-
-	/**
-	 * Waits for rendering to an object by the GPU to have completed.
-	 *
-	 * This is not required for any access to the BO by bo_map,
-	 * bo_subdata, etc.  It is merely a way for the driver to implement
-	 * glFinish.
-	 */
-	void (*bo_wait_rendering) (drm_bacon_bo *bo);
-
-	/**
-	 * Tears down the buffer manager instance.
-	 */
-	void (*destroy) (drm_bacon_bufmgr *bufmgr);
-
-	/**
-	 * Indicate if the buffer can be placed anywhere in the full ppgtt
-	 * address range (2^48).
-	 *
-	 * Any resource used with flat/heapless (0x00000000-0xfffff000)
-	 * General State Heap (GSH) or Intructions State Heap (ISH) must
-	 * be in a 32-bit range. 48-bit range will only be used when explicitly
-	 * requested.
-	 *
-	 * \param bo Buffer to set the use_48b_address_range flag.
-	 * \param enable The flag value.
-	 */
-	void (*bo_use_48b_address_range) (drm_bacon_bo *bo, uint32_t enable);
-
-	/**
-	 * 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 (*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);
-
-	/** Executes the command buffer pointed to by bo. */
-	int (*bo_exec) (drm_bacon_bo *bo, int used,
-			drm_clip_rect_t *cliprects, int num_cliprects,
-			int DR4);
-
-	/** Executes the command buffer pointed to by bo on the selected
-	 * ring buffer
-	 */
-	int (*bo_mrb_exec) (drm_bacon_bo *bo, int used,
-			    drm_clip_rect_t *cliprects, int num_cliprects,
-			    int DR4, unsigned flags);
-
-	/**
-	 * 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 (*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.
-	 *
-	 * \param buf Buffer to get tiling mode for
-	 * \param tiling_mode returned tiling mode
-	 * \param swizzle_mode returned swizzling mode
-	 */
-	int (*bo_get_tiling) (drm_bacon_bo *bo, uint32_t * tiling_mode,
-			      uint32_t * swizzle_mode);
-
-	/**
-	 * Set the offset at which this buffer will be softpinned
-	 * \param bo Buffer to set the softpin offset for
-	 * \param offset Softpin offset
-	 */
-	int (*bo_set_softpin_offset) (drm_bacon_bo *bo, uint64_t offset);
-
-	/**
-	 * Create a visible name for a buffer which can be used by other apps
-	 *
-	 * \param buf Buffer to create a name for
-	 * \param name Returned name
-	 */
-	int (*bo_flink) (drm_bacon_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 (*bo_busy) (drm_bacon_bo *bo);
-
-	/**
-	 * Specify the volatility of the buffer.
-	 * \param bo Buffer to create a name for
-	 * \param madv The purgeable status
-	 *
-	 * Use I915_MADV_DONTNEED to mark the buffer as purgeable, and it will be
-	 * reclaimed under memory pressure. If you subsequently require the buffer,
-	 * then you must pass I915_MADV_WILLNEED to mark the buffer as required.
-	 *
-	 * Returns 1 if the buffer was retained, or 0 if it was discarded whilst
-	 * marked as I915_MADV_DONTNEED.
-	 */
-	int (*bo_madvise) (drm_bacon_bo *bo, int madv);
-
-	int (*check_aperture_space) (drm_bacon_bo ** bo_array, int count);
-
-	/**
-	 * 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 (*bo_disable_reuse) (drm_bacon_bo *bo);
-
-	/**
-	 * Query whether a buffer is reusable.
-	 *
-	 * \param bo Buffer to query
-	 */
-	int (*bo_is_reusable) (drm_bacon_bo *bo);
-
-	/** Returns true if target_bo is in the relocation tree rooted at bo. */
-	int (*bo_references) (drm_bacon_bo *bo, drm_bacon_bo *target_bo);
 };
 
 struct _drm_bacon_context {