From 7e26a02e5fce1d4d0fc3120be323ca1ba899923c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20=C5=9Alusarz?= Date: Wed, 3 Jun 2020 17:00:38 +0200 Subject: [PATCH] iris: remove unused iris_bo->swizzle_mode MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Ślusarz Reviewed-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 13 ------------- src/gallium/drivers/iris/iris_bufmgr.h | 11 ----------- 2 files changed, 24 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index c8e6d0c..cad15be 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -456,7 +456,6 @@ alloc_fresh_bo(struct iris_bufmgr *bufmgr, uint64_t bo_size) bo->size = bo_size; bo->idle = true; bo->tiling_mode = I915_TILING_NONE; - bo->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; bo->stride = 0; /* Calling set_domain() will allocate pages for the BO outside of the @@ -704,7 +703,6 @@ iris_bo_gem_create_from_name(struct iris_bufmgr *bufmgr, goto err_unref; bo->tiling_mode = get_tiling.tiling_mode; - bo->swizzle_mode = get_tiling.swizzle_mode; /* XXX stride is unknown */ DBG("bo_create_from_handle: %d (%s)\n", handle, bo->name); @@ -1325,20 +1323,10 @@ bo_set_tiling_internal(struct iris_bo *bo, uint32_t tiling_mode, return -errno; bo->tiling_mode = set_tiling.tiling_mode; - bo->swizzle_mode = set_tiling.swizzle_mode; bo->stride = set_tiling.stride; return 0; } -int -iris_bo_get_tiling(struct iris_bo *bo, uint32_t *tiling_mode, - uint32_t *swizzle_mode) -{ - *tiling_mode = bo->tiling_mode; - *swizzle_mode = bo->swizzle_mode; - return 0; -} - struct iris_bo * iris_bo_import_dmabuf(struct iris_bufmgr *bufmgr, int prime_fd, uint32_t tiling, uint32_t stride) @@ -1394,7 +1382,6 @@ iris_bo_import_dmabuf(struct iris_bufmgr *bufmgr, int prime_fd, if (get_tiling.tiling_mode == tiling || tiling > I915_TILING_LAST) { bo->tiling_mode = get_tiling.tiling_mode; - bo->swizzle_mode = get_tiling.swizzle_mode; /* XXX stride is unknown */ } else { if (bo_set_tiling_internal(bo, tiling, stride)) { diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h index d7edda2..6ae5598 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.h +++ b/src/gallium/drivers/iris/iris_bufmgr.h @@ -151,7 +151,6 @@ struct iris_bo { * Current tiling mode */ uint32_t tiling_mode; - uint32_t swizzle_mode; uint32_t stride; time_t free_time; @@ -292,16 +291,6 @@ void iris_bo_wait_rendering(struct iris_bo *bo); void iris_bufmgr_unref(struct iris_bufmgr *bufmgr); /** - * 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 iris_bo_get_tiling(struct iris_bo *bo, uint32_t *tiling_mode, - uint32_t *swizzle_mode); - -/** * Create a visible name for a buffer which can be used by other apps * * \param buf Buffer to create a name for -- 2.7.4