radeon: Move si_get_pic_param to radeon_vce.c

[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 427bf01ed8a3f75f9d6179bf41736941841386e7..652b4250654a3208afe50004a03ba7c2ee5205e0 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -48,6 +48,10 @@
 #define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8))
 #define FW_53 (53 << 24)
 
+/* version specific function for getting parameters */
+static void (*si_get_pic_param)(struct rvce_encoder *enc,
+                                struct pipe_h264_enc_picture_desc *pic) = NULL;
+
 /**
  * flush commands to the hardware
  */
@@ -91,14 +95,14 @@ static void reset_cpb(struct rvce_encoder *enc)
 {
        unsigned i;
 
-       LIST_INITHEAD(&enc->cpb_slots);
+       list_inithead(&enc->cpb_slots);
        for (i = 0; i < enc->cpb_num; ++i) {
                struct rvce_cpb_slot *slot = &enc->cpb_array[i];
                slot->index = i;
                slot->picture_type = PIPE_H264_ENC_PICTURE_TYPE_SKIP;
                slot->frame_num = 0;
                slot->pic_order_cnt = 0;
-               LIST_ADDTAIL(&slot->list, &enc->cpb_slots);
+               list_addtail(&slot->list, &enc->cpb_slots);
        }
 }
 
@@ -125,13 +129,13 @@ static void sort_cpb(struct rvce_encoder *enc)
        }
 
        if (l1) {
-               LIST_DEL(&l1->list);
-               LIST_ADD(&l1->list, &enc->cpb_slots);
+               list_del(&l1->list);
+               list_add(&l1->list, &enc->cpb_slots);
        }
 
        if (l0) {
-               LIST_DEL(&l0->list);
-               LIST_ADD(&l0->list, &enc->cpb_slots);
+               list_del(&l0->list);
+               list_add(&l0->list, &enc->cpb_slots);
        }
 }
 
@@ -247,7 +251,6 @@ static void rvce_destroy(struct pipe_video_codec *encoder)
                enc->fb = &fb;
                enc->session(enc);
                enc->destroy(enc);
-               enc->feedback(enc);
                flush(enc);
                si_vid_destroy_buffer(&fb);
        }
@@ -341,8 +344,8 @@ static void rvce_end_frame(struct pipe_video_codec *encoder,
        slot->frame_num = enc->pic.frame_num;
        slot->pic_order_cnt = enc->pic.pic_order_cnt;
        if (!enc->pic.not_referenced) {
-               LIST_DEL(&slot->list);
-               LIST_ADD(&slot->list, &enc->cpb_slots);
+               list_del(&slot->list);
+               list_add(&slot->list, &enc->cpb_slots);
        }
 }
 
@@ -353,7 +356,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 +395,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;
@@ -409,15 +414,16 @@ struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
        if (!enc)
                return NULL;
 
-       if (sscreen->info.drm_major == 3)
+       if (sscreen->info.is_amdgpu)
                enc->use_vm = true;
-       if ((sscreen->info.drm_major == 2 && sscreen->info.drm_minor >= 42) ||
-            sscreen->info.drm_major == 3)
+       if ((!sscreen->info.is_amdgpu && sscreen->info.drm_minor >= 42) ||
+            sscreen->info.is_amdgpu)
                enc->use_vui = true;
        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 +444,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 +512,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 +548,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 +565,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);