media: venus: provide ctx queue lock for ioctl synchronization

Video device has to provide a lock so that __video_do_ioctl()
can serialize IOCTL calls. Introduce a dedicated venus_inst
mutex for the purpose of vb2 operations synchronization.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 250342d27a6f98c19783195104de00d7ab25341b..320bde0f83cb6e1f5e000427dcf1fb2491459e81 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -411,6 +411,7 @@ enum venus_inst_modes {
  * @sequence_out:      a sequence counter for output queue
  * @m2m_dev:   a reference to m2m device structure
  * @m2m_ctx:   a reference to m2m context structure
+ * @ctx_q_lock:        a lock to serialize video device ioctl calls
  * @state:     current state of the instance
  * @done:      a completion for sync HFI operation
  * @error:     an error returned during last HFI sync operation
@@ -482,6 +483,7 @@ struct venus_inst {
        u32 sequence_out;
        struct v4l2_m2m_dev *m2m_dev;
        struct v4l2_m2m_ctx *m2m_ctx;
+       struct mutex ctx_q_lock;
        unsigned int state;
        struct completion done;
        unsigned int error;

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 12a2e99508f504dfbd424ec6c30eaa9a114b24e0..f5676440dd36cf9d6357956ba7b6f6e83b305338 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1643,6 +1643,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
        src_vq->allow_zero_bytesused = 1;
        src_vq->min_buffers_needed = 0;
        src_vq->dev = inst->core->dev;
+       src_vq->lock = &inst->ctx_q_lock;
        ret = vb2_queue_init(src_vq);
        if (ret)
                return ret;
@@ -1657,6 +1658,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
        dst_vq->allow_zero_bytesused = 1;
        dst_vq->min_buffers_needed = 0;
        dst_vq->dev = inst->core->dev;
+       dst_vq->lock = &inst->ctx_q_lock;
        return vb2_queue_init(dst_vq);
 }
 
@@ -1675,6 +1677,7 @@ static int vdec_open(struct file *file)
        INIT_LIST_HEAD(&inst->internalbufs);
        INIT_LIST_HEAD(&inst->list);
        mutex_init(&inst->lock);
+       mutex_init(&inst->ctx_q_lock);
 
        inst->core = core;
        inst->session_type = VIDC_SESSION_TYPE_DEC;
@@ -1750,6 +1753,7 @@ static int vdec_close(struct file *file)
        ida_destroy(&inst->dpb_ids);
        hfi_session_destroy(inst);
        mutex_destroy(&inst->lock);
+       mutex_destroy(&inst->ctx_q_lock);
        v4l2_fh_del(&inst->fh);
        v4l2_fh_exit(&inst->fh);
 

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index b60772cc2cdc91084b0ec4acaa4b676163193e1b..6d773b000e8a7eef8d213d58099f81f1fc3bb4be 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1400,6 +1400,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
        src_vq->allow_zero_bytesused = 1;
        src_vq->min_buffers_needed = 1;
        src_vq->dev = inst->core->dev;
+       src_vq->lock = &inst->ctx_q_lock;
        if (inst->core->res->hfi_version == HFI_VERSION_1XX)
                src_vq->bidirectional = 1;
        ret = vb2_queue_init(src_vq);
@@ -1416,6 +1417,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
        dst_vq->allow_zero_bytesused = 1;
        dst_vq->min_buffers_needed = 1;
        dst_vq->dev = inst->core->dev;
+       dst_vq->lock = &inst->ctx_q_lock;
        return vb2_queue_init(dst_vq);
 }
 
@@ -1448,6 +1450,7 @@ static int venc_open(struct file *file)
        INIT_LIST_HEAD(&inst->internalbufs);
        INIT_LIST_HEAD(&inst->list);
        mutex_init(&inst->lock);
+       mutex_init(&inst->ctx_q_lock);
 
        inst->core = core;
        inst->session_type = VIDC_SESSION_TYPE_ENC;
@@ -1517,6 +1520,7 @@ static int venc_close(struct file *file)
        venc_ctrl_deinit(inst);
        hfi_session_destroy(inst);
        mutex_destroy(&inst->lock);
+       mutex_destroy(&inst->ctx_q_lock);
        v4l2_fh_del(&inst->fh);
        v4l2_fh_exit(&inst->fh);