Re: [PATCH v9 09/15] vb2: mark codec drivers as unordered

[Hans Verkuil]

On 04/05/18 22:06, Ezequiel Garcia wrote:
> From: Gustavo Padovan 
> 
> In preparation to have full support to explicit fence we are
> marking codec as non-ordered preventively. It is easier and safer from an
> uAPI point of view to move from unordered to ordered than the opposite.
> 
> v3: set property instead of callback
> v2: mark only codec drivers as unordered (Nicolas and Hans)
> 
> Signed-off-by: Gustavo Padovan 
> Signed-off-by: Ezequiel Garcia 
> ---
>  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 2 ++
>  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 +
>  drivers/media/platform/qcom/venus/venc.c   | 2 ++
>  drivers/media/platform/s5p-mfc/s5p_mfc.c   | 2 ++

Why were coda, exynos-gsc, exynos4-is and venus/vdec.c removed?
Those were patched in v8.

Regards,

Hans

>  4 files changed, 7 insertions(+)
> 
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c 
> b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> index 86f0a7134365..c03cefde0c28 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> @@ -1498,6 +1498,7 @@ int mtk_vcodec_dec_queue_init(void *priv, struct 
> vb2_queue *src_vq,
>   src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
>   src_vq->lock= >dev->dev_mutex;
>   src_vq->dev = >dev->plat_dev->dev;
> + src_vq->unordered   = 1;
>  
>   ret = vb2_queue_init(src_vq);
>   if (ret) {
> @@ -1513,6 +1514,7 @@ int mtk_vcodec_dec_queue_init(void *priv, struct 
> vb2_queue *src_vq,
>   dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
>   dst_vq->lock= >dev->dev_mutex;
>   dst_vq->dev = >dev->plat_dev->dev;
> + src_vq->unordered   = 1;
>  
>   ret = vb2_queue_init(dst_vq);
>   if (ret) {
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c 
> b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index 1b1a28abbf1f..81751c9aa19d 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> @@ -1340,6 +1340,7 @@ int mtk_vcodec_enc_queue_init(void *priv, struct 
> vb2_queue *src_vq,
>   dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
>   dst_vq->lock= >dev->dev_mutex;
>   dst_vq->dev = >dev->plat_dev->dev;
> + dst_vq->unordered   = 1;
>  
>   return vb2_queue_init(dst_vq);
>  }
> diff --git a/drivers/media/platform/qcom/venus/venc.c 
> b/drivers/media/platform/qcom/venus/venc.c
> index 6b2ce479584e..17ec2d218aa5 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -1053,6 +1053,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue 
> *src_vq,
>   src_vq->buf_struct_size = sizeof(struct venus_buffer);
>   src_vq->allow_zero_bytesused = 1;
>   src_vq->min_buffers_needed = 1;
> + src_vq->unordered = 1;
>   src_vq->dev = inst->core->dev;
>   if (inst->core->res->hfi_version == HFI_VERSION_1XX)
>   src_vq->bidirectional = 1;
> @@ -1069,6 +1070,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue 
> *src_vq,
>   dst_vq->buf_struct_size = sizeof(struct venus_buffer);
>   dst_vq->allow_zero_bytesused = 1;
>   dst_vq->min_buffers_needed = 1;
> + src_vq->unordered = 1;
>   dst_vq->dev = inst->core->dev;
>   ret = vb2_queue_init(dst_vq);
>   if (ret) {
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c 
> b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index a80251ed3143..6a4251f988ab 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -863,6 +863,7 @@ static int s5p_mfc_open(struct file *file)
>   q->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES;
>   q->mem_ops = _dma_contig_memops;
>   q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
> + q->unordered = 1;
>   ret = vb2_queue_init(q);
>   if (ret) {
>   mfc_err("Failed to initialize videobuf2 queue(capture)\n");
> @@ -898,6 +899,7 @@ static int s5p_mfc_open(struct file *file)
>   q->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES;
>   q->mem_ops = _dma_contig_memops;
>   q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
> + q->unordered = 1;
>   ret = vb2_queue_init(q);
>   if (ret) {
>   mfc_err("Failed to initialize videobuf2 queue(output)\n");
> 

[PATCH v9 09/15] vb2: mark codec drivers as unordered

[Ezequiel Garcia]

From: Gustavo Padovan 

In preparation to have full support to explicit fence we are
marking codec as non-ordered preventively. It is easier and safer from an
uAPI point of view to move from unordered to ordered than the opposite.

v3: set property instead of callback
v2: mark only codec drivers as unordered (Nicolas and Hans)

Signed-off-by: Gustavo Padovan 
Signed-off-by: Ezequiel Garcia 
---
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 2 ++
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 +
 drivers/media/platform/qcom/venus/venc.c   | 2 ++
 drivers/media/platform/s5p-mfc/s5p_mfc.c   | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c 
b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index 86f0a7134365..c03cefde0c28 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -1498,6 +1498,7 @@ int mtk_vcodec_dec_queue_init(void *priv, struct 
vb2_queue *src_vq,
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock= >dev->dev_mutex;
src_vq->dev = >dev->plat_dev->dev;
+   src_vq->unordered   = 1;
 
ret = vb2_queue_init(src_vq);
if (ret) {
@@ -1513,6 +1514,7 @@ int mtk_vcodec_dec_queue_init(void *priv, struct 
vb2_queue *src_vq,
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock= >dev->dev_mutex;
dst_vq->dev = >dev->plat_dev->dev;
+   src_vq->unordered   = 1;
 
ret = vb2_queue_init(dst_vq);
if (ret) {
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c 
b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 1b1a28abbf1f..81751c9aa19d 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -1340,6 +1340,7 @@ int mtk_vcodec_enc_queue_init(void *priv, struct 
vb2_queue *src_vq,
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock= >dev->dev_mutex;
dst_vq->dev = >dev->plat_dev->dev;
+   dst_vq->unordered   = 1;
 
return vb2_queue_init(dst_vq);
 }
diff --git a/drivers/media/platform/qcom/venus/venc.c 
b/drivers/media/platform/qcom/venus/venc.c
index 6b2ce479584e..17ec2d218aa5 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1053,6 +1053,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue 
*src_vq,
src_vq->buf_struct_size = sizeof(struct venus_buffer);
src_vq->allow_zero_bytesused = 1;
src_vq->min_buffers_needed = 1;
+   src_vq->unordered = 1;
src_vq->dev = inst->core->dev;
if (inst->core->res->hfi_version == HFI_VERSION_1XX)
src_vq->bidirectional = 1;
@@ -1069,6 +1070,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue 
*src_vq,
dst_vq->buf_struct_size = sizeof(struct venus_buffer);
dst_vq->allow_zero_bytesused = 1;
dst_vq->min_buffers_needed = 1;
+   src_vq->unordered = 1;
dst_vq->dev = inst->core->dev;
ret = vb2_queue_init(dst_vq);
if (ret) {
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c 
b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index a80251ed3143..6a4251f988ab 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -863,6 +863,7 @@ static int s5p_mfc_open(struct file *file)
q->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES;
q->mem_ops = _dma_contig_memops;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+   q->unordered = 1;
ret = vb2_queue_init(q);
if (ret) {
mfc_err("Failed to initialize videobuf2 queue(capture)\n");
@@ -898,6 +899,7 @@ static int s5p_mfc_open(struct file *file)
q->dma_attrs = DMA_ATTR_ALLOC_SINGLE_PAGES;
q->mem_ops = _dma_contig_memops;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+   q->unordered = 1;
ret = vb2_queue_init(q);
if (ret) {
mfc_err("Failed to initialize videobuf2 queue(output)\n");
-- 
2.16.3