From 062dde41517f4acbc26e969046ab7255e64f5749 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 16 Dec 2020 08:36:46 +0100 Subject: [PATCH] panfrost: Pass a device object to panfrost_new_texture() We will need it to merge some of the Bifrost and Midgard logic. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_context.c | 1 + src/panfrost/lib/pan_blit.c | 2 +- src/panfrost/lib/pan_texture.c | 1 + src/panfrost/lib/pan_texture.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index ed4a91e12ab..ea81dfb7533 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -1080,6 +1080,7 @@ panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, so->bo = panfrost_bo_create(device, size, 0); panfrost_new_texture( + device, so->bo->ptr.cpu, texture->width0, texture->height0, depth, array_size, diff --git a/src/panfrost/lib/pan_blit.c b/src/panfrost/lib/pan_blit.c index df4b4bc348c..299c60cbf16 100644 --- a/src/panfrost/lib/pan_blit.c +++ b/src/panfrost/lib/pan_blit.c @@ -311,7 +311,7 @@ midgard_load_emit_texture(struct pan_pool *pool, struct MALI_DRAW *draw, * itself is for a 2D texture with array size 1 even for 3D/array * textures, removing the need to separately key the blit shaders for * 2D and 3D variants */ - panfrost_new_texture(texture.cpu, + panfrost_new_texture(pool->dev, texture.cpu, image->width0, image->height0, MAX2(image->nr_samples, 1), 1, image->format, MALI_TEXTURE_DIMENSION_2D, diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c index 05c9c48ffef..0d18bd7ed9c 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -366,6 +366,7 @@ panfrost_emit_texture_payload_v7(mali_ptr *payload, void panfrost_new_texture( + const struct panfrost_device *dev, void *out, uint16_t width, uint16_t height, uint16_t depth, uint16_t array_size, diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index d2343f3109d..f9cd15d61a1 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -102,6 +102,7 @@ panfrost_estimate_texture_payload_size( void panfrost_new_texture( + const struct panfrost_device *dev, void *out, uint16_t width, uint16_t height, uint16_t depth, uint16_t array_size,