From 21d83f54b36d76901ecf168b0fd44562c5be6ce3 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 12 Jun 2017 09:40:42 -0700 Subject: [PATCH] i965/bufmgr: Add a new, simpler, bo_alloc_tiled ISL already has all of the complexity required to figure out the correct surface pitch and size taking tile alignment into account. When we get a surface out of ISL, the pitch and size are already correct and using brw_bo_alloc_tiled_2d doesn't actually gain us anything other than extra asserts we have to do in order to ensure that the bufmgr code and ISL agree. This new helper doesn't try to be smart but just allocates the BO you ask for and sets up the tiling. Reviewed-by: Plamena Manolova Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_bufmgr.c | 8 ++++++++ src/mesa/drivers/dri/i965/brw_bufmgr.h | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c index 26f14233e70..42cc0c28f3b 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c @@ -373,6 +373,14 @@ brw_bo_alloc(struct brw_bufmgr *bufmgr, return bo_alloc_internal(bufmgr, name, size, 0, I915_TILING_NONE, 0, 0); } +struct brw_bo * +brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, const char *name, + uint64_t size, uint32_t tiling_mode, uint32_t pitch, + unsigned flags) +{ + return bo_alloc_internal(bufmgr, name, size, flags, tiling_mode, pitch, 0); +} + struct brw_bo * brw_bo_alloc_tiled_2d(struct brw_bufmgr *bufmgr, const char *name, int x, int y, int cpp, uint32_t tiling, diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h index 1c116c2c091..48488bc33b2 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.h +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h @@ -142,6 +142,24 @@ struct brw_bo { struct brw_bo *brw_bo_alloc(struct brw_bufmgr *bufmgr, const char *name, uint64_t size, uint64_t alignment); +/** + * 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 + */ +struct brw_bo *brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, + const char *name, + uint64_t size, + uint32_t tiling_mode, + uint32_t pitch, + unsigned flags); + /** * Allocate a tiled buffer object. * -- 2.30.2