Mesa (master): lima: use passed surface to get mipmap level for reload, not cbuf

[GitLab Mirror]

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

Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Mon Apr 12 08:10:29 2021 -0700

lima: use passed surface to get mipmap level for reload, not cbuf

lima_pack_reload_plbu_cmd() can be used for either cbuf or zsbuf, so
use passed surface other using cbuf unconditionally.

Fixes: b8c31ac06d35 ("lima: fix glCopyTexSubImage2D")
Reviewed-by: Erico Nunes <nunes.erico at gmail.com>
Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10121>

---

 src/gallium/drivers/lima/lima_job.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/lima/lima_job.c b/src/gallium/drivers/lima/lima_job.c
index cec4084f312..48f3ddafac3 100644
--- a/src/gallium/drivers/lima/lima_job.c
+++ b/src/gallium/drivers/lima/lima_job.c
@@ -345,10 +345,8 @@ lima_pack_reload_plbu_cmd(struct lima_job *job, struct pipe_surface *psurf)
 
    struct lima_context *ctx = job->ctx;
    struct lima_surface *surf = lima_surface(psurf);
-
-   struct pipe_surface *cbuf = job->key.cbuf;
-   int level = cbuf->u.tex.level;
-   unsigned first_layer = cbuf->u.tex.first_layer;
+   int level = psurf->u.tex.level;
+   unsigned first_layer = psurf->u.tex.first_layer;
 
    uint32_t va;
    void *cpu = lima_job_create_stream_bo(