Browse Source

video: driver: rename request_lock with ctx_q_lock for queues

This lock is not related to requests and used to serialize
IOCTL calls related to queues, hence change the name of the
lock to avoid any confusion.

Change-Id: I673a3331cbf67b3767b3ba75cfe203c4d45489cb
Signed-off-by: Dikshita Agarwal <[email protected]>
Dikshita Agarwal 2 years ago
parent
commit
a683290a91

+ 1 - 1
driver/vidc/inc/msm_vidc_inst.h

@@ -67,7 +67,7 @@ struct buf_queue {
 struct msm_vidc_inst {
 	struct list_head                   list;
 	struct mutex                       lock;
-	struct mutex                       request_lock;
+	struct mutex                       ctx_q_lock;
 	struct mutex                       client_lock;
 	enum msm_vidc_state                state;
 	int                              (*event_handle)(struct msm_vidc_inst *inst,

+ 2 - 2
driver/vidc/src/msm_vidc.c

@@ -741,7 +741,7 @@ void *msm_vidc_open(struct msm_vidc_core *core, u32 session_type)
 	inst->initial_time_us = ktime_get_ns() / 1000;
 	kref_init(&inst->kref);
 	mutex_init(&inst->lock);
-	mutex_init(&inst->request_lock);
+	mutex_init(&inst->ctx_q_lock);
 	mutex_init(&inst->client_lock);
 	msm_vidc_update_debug_str(inst);
 	i_vpr_h(inst, "Opening video instance: %d\n", session_type);
@@ -860,7 +860,7 @@ fail_pools_init:
 	msm_vidc_remove_dangling_session(inst);
 fail_add_session:
 	mutex_destroy(&inst->client_lock);
-	mutex_destroy(&inst->request_lock);
+	mutex_destroy(&inst->ctx_q_lock);
 	mutex_destroy(&inst->lock);
 	msm_vidc_vmem_free((void **)&inst);
 	return NULL;

+ 2 - 2
driver/vidc/src/msm_vidc_driver.c

@@ -3092,7 +3092,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
 	core = inst->core;
 
 	src_vq->supports_requests = core->capabilities[SUPPORTS_REQUESTS].value;
-	src_vq->lock = &inst->request_lock;
+	src_vq->lock = &inst->ctx_q_lock;
 	src_vq->dev = &core->pdev->dev;
 	rc = vb2q_init(inst, src_vq, INPUT_MPLANE);
 	if (rc)
@@ -4581,7 +4581,7 @@ static void msm_vidc_close_helper(struct kref *kref)
 	msm_vidc_remove_session(inst);
 	msm_vidc_remove_dangling_session(inst);
 	mutex_destroy(&inst->client_lock);
-	mutex_destroy(&inst->request_lock);
+	mutex_destroy(&inst->ctx_q_lock);
 	mutex_destroy(&inst->lock);
 	msm_vidc_vmem_free((void **)&inst);
 }