From 4bc0059229f212e91ca266ef3f80b652b1cdcb86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 11 Sep 2014 09:29:28 +0200 Subject: radeon/video: use more of the common buffer code v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation to using buffers clears with the hw engine(s). v2: split out flipping to using hw buffer clears. Signed-off-by: Christian König Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeon/radeon_vce_40_2_2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/radeon/radeon_vce_40_2_2.c') diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c index 6b5da47..06d3e95 100644 --- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c +++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c @@ -41,6 +41,7 @@ #include "vl/vl_video_buffer.h" #include "radeon/drm/radeon_winsys.h" +#include "r600_pipe_common.h" #include "radeon_video.h" #include "radeon_vce.h" @@ -94,7 +95,7 @@ static void task_info(struct rvce_encoder *enc, uint32_t taskOperation) static void feedback(struct rvce_encoder *enc) { RVCE_BEGIN(0x05000005); // feedback buffer - RVCE_WRITE(enc->fb->cs_handle, enc->fb->domain); // feedbackRingAddressHi + RVCE_WRITE(enc->fb->res->cs_buf, enc->fb->res->domains); // feedbackRingAddressHi RVCE_CS(0x00000000); // feedbackRingAddressLo RVCE_CS(0x00000001); // feedbackRingSize RVCE_END(); @@ -255,7 +256,7 @@ static void encode(struct rvce_encoder *enc) task_info(enc, 0x00000003); RVCE_BEGIN(0x05000001); // context buffer - RVCE_READWRITE(enc->cpb.cs_handle, enc->cpb.domain); // encodeContextAddressHi + RVCE_READWRITE(enc->cpb.res->cs_buf, enc->cpb.res->domains); // encodeContextAddressHi RVCE_CS(0x00000000); // encodeContextAddressLo RVCE_END(); -- cgit v1.1