From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Thu, 29 Sep 2016 14:47:53 +0000 (+0200)
Subject: radeon/vce: adjust the buffer offset when relocation is used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a48bf02d;p=mesa.git

radeon/vce: adjust the buffer offset when relocation is used

We don't plan to use sub-allocated buffers with VCE, but just in case one
slips through, this increases the chances of things working out anyway.

Reviewed-by: Christian König <christian.koenig@amd.com>
---

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 10c5a78dd33..30705c1caef 100644
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -549,6 +549,7 @@ void rvce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf,
 		RVCE_CS(addr >> 32);
 		RVCE_CS(addr);
 	} else {
+		offset += enc->ws->buffer_get_virtual_address(buf);
 		RVCE_CS(reloc_idx * 4);
 		RVCE_CS(offset);
 	}