From 5fa1f9115d13d5b20b3935d3133733f1c0da8b4d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 25 May 2023 11:32:46 +1000 Subject: [PATCH] radv/video: add missing offset to the dpb binding. This doesn't affect anything I've seen yet. Fixes: 3e2c768aa860 ("radv/vcn: enable dynamic dpb tier 2 for h264/h265 on navi21+") Reviewed-by: Lynne Part-of: (cherry picked from commit cf1bd0f3644444b3a0d3f147bc25d463107585f1) --- .pick_status.json | 2 +- src/amd/vulkan/radv_video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2e09527fbb7..07240310af9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1660,7 +1660,7 @@ "description": "radv/video: add missing offset to the dpb binding.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3e2c768aa860f96074df73cd3171960e76f5c312" }, diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 06ec08bd895..93b4049e9ea 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -1050,7 +1050,7 @@ static bool rvcn_dec_message_decode(struct radv_cmd_buffer *cmd_buffer, } radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, dpb->bindings[0].bo); - addr = radv_buffer_get_va(dpb->bindings[0].bo); + addr = radv_buffer_get_va(dpb->bindings[0].bo) + dpb->bindings[0].offset; dynamic_dpb_t2->dpbCurrLo = addr; dynamic_dpb_t2->dpbCurrHi = addr >> 32;