diff options
| author | Christian König <christian.koenig@amd.com> | 2014-04-10 17:18:32 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-08-14 15:02:30 +0200 |
| commit | 67586c4b40881940535658c3c89b5b1a42f94027 (patch) | |
| tree | 5700bb00cafd9ac5a3fcf700bcc07a19cf2ee448 /src/gallium/drivers/radeon/radeon_vce.c | |
| parent | 0248c13a8b1e10e2c8c8d614473c701239627a71 (diff) | |
| download | external_mesa3d-67586c4b40881940535658c3c89b5b1a42f94027.zip external_mesa3d-67586c4b40881940535658c3c89b5b1a42f94027.tar.gz external_mesa3d-67586c4b40881940535658c3c89b5b1a42f94027.tar.bz2 | |
gallium/radeon: use VM for VCE
v2: (leo) add checking for driver backend
v3: (leo) change variable name from use_amdgpu to use_vm
v4: rebase by Marek
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/radeon_vce.c')
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vce.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 4557ce5..c7b8952 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -396,6 +396,8 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context, if (!enc) return NULL; + if (rscreen->info.drm_major == 3) + enc->use_vm = true; if ((rscreen->info.drm_major > 2) || (rscreen->info.drm_minor >= 42)) enc->use_vui = true; @@ -485,3 +487,25 @@ bool rvce_is_fw_version_supported(struct r600_common_screen *rscreen) rscreen->info.vce_fw_version == FW_50_0_1 || rscreen->info.vce_fw_version == FW_50_1_2; } + +/** + * Add the buffer as relocation to the current command submission + */ +void rvce_add_buffer(struct rvce_encoder *enc, struct radeon_winsys_cs_handle *buf, + enum radeon_bo_usage usage, enum radeon_bo_domain domain, + uint32_t offset) +{ + int reloc_idx; + + reloc_idx = enc->ws->cs_add_reloc(enc->cs, buf, usage, domain, RADEON_PRIO_MIN); + 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 { + RVCE_CS(reloc_idx * 4); + RVCE_CS(offset); + } +} |