summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-09-11 09:29:28 +0200
committerChristian König <christian.koenig@amd.com>2014-09-11 15:05:55 +0200
commit4bc0059229f212e91ca266ef3f80b652b1cdcb86 (patch)
treeff01c59ef02a3aba3733ac6dc09c1dc679046e93 /src/gallium/drivers/radeon/radeon_vce_40_2_2.c
parent771ab951a8d3d16f577f0438a8d03544ff32b21f (diff)
downloadexternal_mesa3d-4bc0059229f212e91ca266ef3f80b652b1cdcb86.zip
external_mesa3d-4bc0059229f212e91ca266ef3f80b652b1cdcb86.tar.gz
external_mesa3d-4bc0059229f212e91ca266ef3f80b652b1cdcb86.tar.bz2
radeon/video: use more of the common buffer code v2
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 <christian.koenig@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/radeon_vce_40_2_2.c')
-rw-r--r--src/gallium/drivers/radeon/radeon_vce_40_2_2.c5
1 files changed, 3 insertions, 2 deletions
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();