Attachment 126871 Details for Bug 97969 – possible fix

[patch] possible fix

radeon-uvd-vce.patch (text/plain), 1.68 KB, created by Nicolai Hähnle on 2016-09-29 14:52:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolai Hähnle

Created: 2016-09-29 14:52:47 UTC

Size: 1.68 KB

patch

obsolete

>diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
>index 3ae0eaa..9c376cb 100644
>--- a/src/gallium/drivers/radeon/radeon_uvd.c
>+++ b/src/gallium/drivers/radeon/radeon_uvd.c
>@@ -116,20 +116,21 @@ static void send_cmd(struct ruvd_decoder *dec, unsigned cmd,
> 	reloc_idx = dec->ws->cs_add_buffer(dec->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED,
> 					   domain,
> 					  RADEON_PRIO_UVD);
> 	if (!dec->use_legacy) {
> 		uint64_t addr;
> 		addr = dec->ws->buffer_get_virtual_address(buf);
> 		addr = addr + off;
> 		set_reg(dec, RUVD_GPCOM_VCPU_DATA0, addr);
> 		set_reg(dec, RUVD_GPCOM_VCPU_DATA1, addr >> 32);
> 	} else {
>+		off += dec->ws->buffer_get_virtual_address(buf);
> 		set_reg(dec, RUVD_GPCOM_VCPU_DATA0, off);
> 		set_reg(dec, RUVD_GPCOM_VCPU_DATA1, reloc_idx * 4);
> 	}
> 	set_reg(dec, RUVD_GPCOM_VCPU_CMD, cmd << 1);
> }
> 
> /* do the codec needs an IT buffer ?*/
> static bool have_it(struct ruvd_decoder *dec)
> {
> 	return dec->stream_type == RUVD_CODEC_H264_PERF ||
>diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
>index 10c5a78..30705c1 100644
>--- a/src/gallium/drivers/radeon/radeon_vce.c
>+++ b/src/gallium/drivers/radeon/radeon_vce.c
>@@ -542,14 +542,15 @@ void rvce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf,
> 
> 	reloc_idx = enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED,
> 					   domain, RADEON_PRIO_VCE);
> 	if (enc->use_vm) {
> 		uint64_t addr;
> 		addr = enc->ws->buffer_get_virtual_address(buf);
> 		addr = addr + offset;
> 		RVCE_CS(addr >> 32);
> 		RVCE_CS(addr);
> 	} else {
>+		offset += enc->ws->buffer_get_virtual_address(buf);
> 		RVCE_CS(reloc_idx * 4);
> 		RVCE_CS(offset);
> 	}
> }

Actions: View | Splinter Review

Attachments on bug 97969: 126871

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.