media: mediatek: vcodec: get capture queue buffer size from scp

Different capture buffer format has different buffer size, need to get
real buffer size according to buffer type from scp.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h
index bf54d6d9a857db3e8c0db050b3ce89c4100392fc..47070be2a99148f0bc7d0d3976d60ae8b8e05015 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h
+++ b/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h
@@ -20,6 +20,7 @@ enum vdec_ipi_msgid {
        AP_IPIMSG_DEC_RESET = 0xA004,
        AP_IPIMSG_DEC_CORE = 0xA005,
        AP_IPIMSG_DEC_CORE_END = 0xA006,
+       AP_IPIMSG_DEC_GET_PARAM = 0xA007,
 
        VPU_IPIMSG_DEC_INIT_ACK = 0xB000,
        VPU_IPIMSG_DEC_START_ACK = 0xB001,
@@ -28,6 +29,7 @@ enum vdec_ipi_msgid {
        VPU_IPIMSG_DEC_RESET_ACK = 0xB004,
        VPU_IPIMSG_DEC_CORE_ACK = 0xB005,
        VPU_IPIMSG_DEC_CORE_END_ACK = 0xB006,
+       VPU_IPIMSG_DEC_GET_PARAM_ACK = 0xB007,
 };
 
 /**
@@ -114,4 +116,38 @@ struct vdec_vpu_ipi_init_ack {
        uint32_t inst_id;
 };
 
+/**
+ * struct vdec_ap_ipi_get_param - for AP_IPIMSG_DEC_GET_PARAM
+ * @msg_id     : AP_IPIMSG_DEC_GET_PARAM
+ * @inst_id     : instance ID. Used if the ABI version >= 2.
+ * @data       : picture information
+ * @param_type : get param type
+ * @codec_type : Codec fourcc
+ */
+struct vdec_ap_ipi_get_param {
+       u32 msg_id;
+       u32 inst_id;
+       u32 data[4];
+       u32 param_type;
+       u32 codec_type;
+};
+
+/**
+ * struct vdec_vpu_ipi_get_param_ack - for VPU_IPIMSG_DEC_GET_PARAM_ACK
+ * @msg_id     : VPU_IPIMSG_DEC_GET_PARAM_ACK
+ * @status     : VPU execution result
+ * @ap_inst_addr       : AP vcodec_vpu_inst instance address
+ * @data     : picture information from SCP.
+ * @param_type : get param type
+ * @reserved : reserved param
+ */
+struct vdec_vpu_ipi_get_param_ack {
+       u32 msg_id;
+       s32 status;
+       u64 ap_inst_addr;
+       u32 data[4];
+       u32 param_type;
+       u32 reserved;
+};
+
 #endif

diff --git a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
index 7210061c772fe0ae9f248197030c208609c7565b..35f4d558308495f801d4afa02751d9495b71300c 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
@@ -6,6 +6,7 @@
 
 #include "mtk_vcodec_drv.h"
 #include "mtk_vcodec_util.h"
+#include "vdec_drv_if.h"
 #include "vdec_ipi_msg.h"
 #include "vdec_vpu_if.h"
 #include "mtk_vcodec_fw.h"
@@ -54,6 +55,26 @@ static void handle_init_ack_msg(const struct vdec_vpu_ipi_init_ack *msg)
        }
 }
 
+static void handle_get_param_msg_ack(const struct vdec_vpu_ipi_get_param_ack *msg)
+{
+       struct vdec_vpu_inst *vpu = (struct vdec_vpu_inst *)
+                                       (unsigned long)msg->ap_inst_addr;
+
+       mtk_vcodec_debug(vpu, "+ ap_inst_addr = 0x%llx", msg->ap_inst_addr);
+
+       /* param_type is enum vdec_get_param_type */
+       switch (msg->param_type) {
+       case GET_PARAM_PIC_INFO:
+               vpu->fb_sz[0] = msg->data[0];
+               vpu->fb_sz[1] = msg->data[1];
+               break;
+       default:
+               mtk_vcodec_err(vpu, "invalid get param type=%d", msg->param_type);
+               vpu->failure = 1;
+               break;
+       }
+}
+
 /*
  * vpu_dec_ipi_handler - Handler for VPU ipi message.
  *
@@ -89,6 +110,9 @@ static void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv)
                case VPU_IPIMSG_DEC_CORE_END_ACK:
                        break;
 
+               case VPU_IPIMSG_DEC_GET_PARAM_ACK:
+                       handle_get_param_msg_ack(data);
+                       break;
                default:
                        mtk_vcodec_err(vpu, "invalid msg=%X", msg->msg_id);
                        break;
@@ -217,6 +241,31 @@ int vpu_dec_start(struct vdec_vpu_inst *vpu, uint32_t *data, unsigned int len)
        return err;
 }
 
+int vpu_dec_get_param(struct vdec_vpu_inst *vpu, uint32_t *data,
+                     unsigned int len, unsigned int param_type)
+{
+       struct vdec_ap_ipi_get_param msg;
+       int err;
+
+       mtk_vcodec_debug_enter(vpu);
+
+       if (len > ARRAY_SIZE(msg.data)) {
+               mtk_vcodec_err(vpu, "invalid len = %d\n", len);
+               return -EINVAL;
+       }
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_id = AP_IPIMSG_DEC_GET_PARAM;
+       msg.inst_id = vpu->inst_id;
+       memcpy(msg.data, data, sizeof(unsigned int) * len);
+       msg.param_type = param_type;
+       msg.codec_type = vpu->codec_type;
+
+       err = vcodec_vpu_send_msg(vpu, (void *)&msg, sizeof(msg));
+       mtk_vcodec_debug(vpu, "- ret=%d", err);
+       return err;
+}
+
 int vpu_dec_core(struct vdec_vpu_inst *vpu)
 {
        return vcodec_send_ap_ipi(vpu, AP_IPIMSG_DEC_CORE);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h
index 4cb3c7f5a3ad217afe55c0b961a4bd8aab07a541..fe6815d31e502133bb21f4df366124d02fdf96a8 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h
+++ b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h
@@ -28,6 +28,7 @@ struct mtk_vcodec_ctx;
  * @wq          : wait queue to wait VPU message ack
  * @handler     : ipi handler for each decoder
  * @codec_type     : use codec type to separate different codecs
+ * @fb_sz  : frame buffer size of each plane
  */
 struct vdec_vpu_inst {
        int id;
@@ -42,6 +43,7 @@ struct vdec_vpu_inst {
        wait_queue_head_t wq;
        mtk_vcodec_ipi_handler handler;
        unsigned int codec_type;
+       unsigned int fb_sz[2];
 };
 
 /**
@@ -104,4 +106,15 @@ int vpu_dec_core(struct vdec_vpu_inst *vpu);
  */
 int vpu_dec_core_end(struct vdec_vpu_inst *vpu);
 
+/**
+ * vpu_dec_get_param - get param from scp
+ *
+ * @vpu : instance for vdec_vpu_inst
+ * @data: meta data to pass bitstream info to VPU decoder
+ * @len : meta data length
+ * @param_type : get param type
+ */
+int vpu_dec_get_param(struct vdec_vpu_inst *vpu, uint32_t *data,
+                     unsigned int len, unsigned int param_type);
+
 #endif