From bdc7e7a786d5b9eb2a76d4f0fb8d5ca9ceffd68e Mon Sep 17 00:00:00 2001 From: Lars-Ivar Hesselberg Simonsen Date: Tue, 6 May 2025 16:42:44 +0200 Subject: [PATCH] pan/texture: Set plane size to slice size Rather than setting the plane size to the full allocation minus the current offset, set it to the actual size of the plane. Fixes: db20152c8a8 ("panfrost: Handle Valhall texturing") Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 6a9a4b3eef9a548249287e2bd91bd39e5ccc4d92) --- .pick_status.json | 2 +- src/panfrost/lib/pan_texture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 85dd9322ec4..3825641b19e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3714,7 +3714,7 @@ "description": "pan/texture: Set plane size to slice size", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "db20152c8a85a425dd54b27cc00961d2b5a4650f", "notes": null diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c index 817706c45f7..0cadf34afeb 100644 --- a/src/panfrost/lib/pan_texture.c +++ b/src/panfrost/lib/pan_texture.c @@ -429,7 +429,7 @@ panfrost_emit_plane(const struct pan_image_view *iview, pan_cast_and_pack(*payload, PLANE, cfg) { cfg.pointer = pointer; cfg.row_stride = row_stride; - cfg.size = layout->data_size - layout->slices[level].offset; + cfg.size = layout->slices[level].size; if (is_chroma_2p) { cfg.two_plane_yuv_chroma.secondary_pointer =