radeon/video: add gfx9 offsets when rejoin the video surface

For CPU access.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
index 4f796e8036e143dcf9adeaa76bb1be461b75c4e2..2a7ad187bec208814727440ae94084920792e597 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -182,8 +182,11 @@ void si_vid_join_surfaces(struct r600_common_context *rctx,
 
                        for (j = 0; j < ARRAY_SIZE(surfaces[i]->u.legacy.level); ++j)
                                surfaces[i]->u.legacy.level[j].offset += off;
-               } else
+               } else {
                        surfaces[i]->u.gfx9.surf_offset += off;
+                       for (j = 0; j < ARRAY_SIZE(surfaces[i]->u.gfx9.offset); ++j)
+                               surfaces[i]->u.gfx9.offset[j] += off;
+               }
 
                off += surfaces[i]->surf_size;
        }