diff --git a/.pick_status.json b/.pick_status.json
index 0a7e2387fc0..71def7ec37b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2650,7 +2650,7 @@
         "description": "aux/tc: fix staging buffer sizing for texture_subdata",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "51ad269198e425fae719a37f169b365a8b52e7f3"
     },
diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index 3d4daf7729b..2a296895346 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -3154,7 +3154,7 @@ tc_texture_subdata(struct pipe_context *_pipe,
             format = PIPE_FORMAT_S8_UINT;
          unsigned fmt_stride = util_format_get_stride(format, box->width);
          unsigned fmt_layer_stride = util_format_get_2d_size(format, stride, box->height);
-         struct pipe_resource *pres = pipe_buffer_create_with_data(pipe, 0, PIPE_USAGE_STREAM, fmt_layer_stride * box->depth, data);
+         struct pipe_resource *pres = pipe_buffer_create_with_data(pipe, 0, PIPE_USAGE_STREAM, layer_stride * box->depth, data);
          struct pipe_box src_box = *box;
          src_box.x = src_box.y = src_box.z = 0;