Mesa (master): panfrost: Get layer stride of level 0 on staging resources

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6aed981e9dea77c90efacc768a6590280dbaebb6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6aed981e9dea77c90efacc768a6590280dbaebb6

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Tue Jan 12 14:40:18 2021 +0100

panfrost: Get layer stride of level 0 on staging resources

Staging resources have one level, we shouldn't query the stride of
level > 0.

Fixes: 3c92abe35937 ("panfrost: Use panfrost_get_layer_stride() instead of open-coding it")
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8449>

---

 src/gallium/drivers/panfrost/pan_resource.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 9c534497372..88d296bb62e 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -929,9 +929,13 @@ panfrost_ptr_map(struct pipe_context *pctx,
         /* We don't have s/w routines for AFBC, so use a staging texture */
         if (drm_is_afbc(rsrc->layout.modifier)) {
                 struct panfrost_resource *staging = pan_alloc_staging(ctx, rsrc, level, box);
+
+                /* Staging resources have one LOD: level 0. Query the strides
+                 * on this LOD.
+                 */
                 transfer->base.stride = staging->layout.slices[0].line_stride;
                 transfer->base.layer_stride =
-                        panfrost_get_layer_stride(&staging->layout, level);
+                        panfrost_get_layer_stride(&staging->layout, 0);
 
                 transfer->staging.rsrc = &staging->base;