freedreno: a2xx: fix VERTEX_REUSE/DEALLOC on a20x

[mesa.git] / src / gallium / drivers / radeon / radeon_vce.c

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 69e602210b33769357659c4e72681791fb3b8497..94df06e88c6b5334a899109050a400a99d2f374a 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -246,7 +246,6 @@ static void rvce_destroy(struct pipe_video_codec *encoder)
                si_vid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
                enc->fb = &fb;
                enc->session(enc);
-               enc->feedback(enc);
                enc->destroy(enc);
                flush(enc);
                si_vid_destroy_buffer(&fb);
@@ -353,7 +352,9 @@ static void rvce_get_feedback(struct pipe_video_codec *encoder,
        struct rvid_buffer *fb = feedback;
 
        if (size) {
-               uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs, PIPE_TRANSFER_READ_WRITE);
+               uint32_t *ptr = enc->ws->buffer_map(
+                       fb->res->buf, enc->cs,
+                       PIPE_TRANSFER_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
 
                if (ptr[1]) {
                        *size = ptr[4] - ptr[9];
@@ -390,7 +391,7 @@ struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
                                               rvce_get_buffer get_buffer)
 {
        struct si_screen *sscreen = (struct si_screen *)context->screen;
-       struct r600_common_context *rctx = (struct r600_common_context*)context;
+       struct si_context *sctx = (struct si_context*)context;
        struct rvce_encoder *enc;
        struct pipe_video_buffer *tmp_buf, templat = {};
        struct radeon_surf *tmp_surf;
@@ -417,7 +418,8 @@ struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
        if (sscreen->info.family >= CHIP_TONGA &&
            sscreen->info.family != CHIP_STONEY &&
            sscreen->info.family != CHIP_POLARIS11 &&
-           sscreen->info.family != CHIP_POLARIS12)
+           sscreen->info.family != CHIP_POLARIS12 &&
+           sscreen->info.family != CHIP_VEGAM)
                enc->dual_pipe = true;
        /* TODO enable B frame with dual instance */
        if ((sscreen->info.family >= CHIP_TONGA) &&
@@ -438,7 +440,7 @@ struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
 
        enc->screen = context->screen;
        enc->ws = ws;
-       enc->cs = ws->cs_create(rctx->ctx, RING_VCE, rvce_cs_flush, enc);
+       enc->cs = ws->cs_create(sctx->ctx, RING_VCE, rvce_cs_flush, enc, false);
        if (!enc->cs) {
                RVID_ERR("Can't get command submission context.\n");
                goto error;
@@ -506,7 +508,7 @@ struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
                break;
 
        default:
-               if ((sscreen->info.vce_fw_version & (0xff << 24)) == FW_53) {
+               if ((sscreen->info.vce_fw_version & (0xff << 24)) >= FW_53) {
                        si_vce_52_init(enc);
                        si_get_pic_param = si_vce_52_get_param;
                } else
@@ -542,7 +544,7 @@ bool si_vce_is_fw_version_supported(struct si_screen *sscreen)
        case FW_52_8_3:
                return true;
        default:
-               if ((sscreen->info.vce_fw_version & (0xff << 24)) == FW_53)
+               if ((sscreen->info.vce_fw_version & (0xff << 24)) >= FW_53)
                        return true;
                else
                        return false;
@@ -559,7 +561,7 @@ void si_vce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf,
        int reloc_idx;
 
        reloc_idx = enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED,
-                                          domain, RADEON_PRIO_VCE);
+                                          domain, 0);
        if (enc->use_vm) {
                uint64_t addr;
                addr = enc->ws->buffer_get_virtual_address(buf);