samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: add reqbuf allow checks inside state handler

Browse Source 
use state specific checks inside state_handler instead of
relying global msm_vidc_allow_reqbufs function.

Change-Id: Iaf7f23e4e2ef9b714e3d4c2900c2753d74150fd1
Signed-off-by: Govindaraj Rajagopal <quic_grajagop@quicinc.com>
This commit is contained in:
Govindaraj Rajagopal
2023-02-16 15:02:50 +05:30
parent 373880e521
commit 3ba2cb9ed1
4 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
driver/vidc/inc/msm_vidc_driver.h
View File

@@ -492,7 +492,6 @@ bool msm_vidc_allow_metadata_subscription(struct msm_vidc_inst *inst,
bool msm_vidc_allow_property(struct msm_vidc_inst *inst, u32 hfi_id); bool msm_vidc_allow_property(struct msm_vidc_inst *inst, u32 hfi_id);
int msm_vidc_update_property_cap(struct msm_vidc_inst *inst, u32 hfi_id, int msm_vidc_update_property_cap(struct msm_vidc_inst *inst, u32 hfi_id,
bool allow); bool allow);
bool msm_vidc_allow_reqbufs(struct msm_vidc_inst *inst, u32 type);
enum msm_vidc_allow msm_vidc_allow_stop(struct msm_vidc_inst *inst); enum msm_vidc_allow msm_vidc_allow_stop(struct msm_vidc_inst *inst);
bool msm_vidc_allow_start(struct msm_vidc_inst *inst); bool msm_vidc_allow_start(struct msm_vidc_inst *inst);
bool msm_vidc_allow_streamon(struct msm_vidc_inst *inst, u32 type); bool msm_vidc_allow_streamon(struct msm_vidc_inst *inst, u32 type);

5
driver/vidc/src/msm_vidc.c
View File

@@ -397,11 +397,6 @@ int msm_vidc_reqbufs(void *instance, struct v4l2_requestbuffers *b)
return -EINVAL; return -EINVAL;
} }
if (!msm_vidc_allow_reqbufs(inst, b->type)) {
rc = -EBUSY;
goto exit;
}
port = v4l2_type_to_driver_port(inst, b->type, __func__); port = v4l2_type_to_driver_port(inst, b->type, __func__);
if (port < 0) { if (port < 0) {
rc = -EINVAL; rc = -EINVAL;

32
driver/vidc/src/msm_vidc_driver.c
View File

@@ -1115,38 +1115,6 @@ int msm_vidc_update_property_cap(struct msm_vidc_inst *inst, u32 hfi_id,
return rc; return rc;
} }
bool msm_vidc_allow_reqbufs(struct msm_vidc_inst *inst, u32 type)
{
bool allow = false;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return false;
}
if (is_state(inst, MSM_VIDC_OPEN)) {
allow = true;
goto exit;
}
if (type == OUTPUT_MPLANE || type == OUTPUT_META_PLANE) {
if (is_state(inst, MSM_VIDC_INPUT_STREAMING)) {
allow = true;
goto exit;
}
}
if (type == INPUT_MPLANE || type == INPUT_META_PLANE) {
if (is_state(inst, MSM_VIDC_OUTPUT_STREAMING)) {
allow = true;
goto exit;
}
}
exit:
if (!allow)
i_vpr_e(inst, "%s: type %d not allowed in state %s\n",
__func__, type, state_name(inst->state));
return allow;
}
enum msm_vidc_allow msm_vidc_allow_stop(struct msm_vidc_inst *inst) enum msm_vidc_allow msm_vidc_allow_stop(struct msm_vidc_inst *inst)
{ {
enum msm_vidc_allow allow = MSM_VIDC_DISALLOW; enum msm_vidc_allow allow = MSM_VIDC_DISALLOW;

15
driver/vidc/src/msm_vidc_state.c
View File

@@ -668,6 +668,7 @@ static int msm_vidc_open_state(struct msm_vidc_inst *inst,
{ {
struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data; struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data;
/* allow reqbufs request in open state */
rc = msm_vidc_reqbufs(inst, b); rc = msm_vidc_reqbufs(inst, b);
if (rc) if (rc)
return rc; return rc;
@@ -813,6 +814,13 @@ static int msm_vidc_input_streaming_state(struct msm_vidc_inst *inst,
{ {
struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data; struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data;
/* disallow */
if (b->type == INPUT_MPLANE || b->type == INPUT_META_PLANE) {
i_vpr_e(inst, "%s: (%s) not allowed for (%s) port\n",
__func__, event_name(event), v4l2_type_name(b->type));
return -EBUSY;
}
rc = msm_vidc_reqbufs(inst, b); rc = msm_vidc_reqbufs(inst, b);
if (rc) if (rc)
return rc; return rc;
@@ -970,6 +978,13 @@ static int msm_vidc_output_streaming_state(struct msm_vidc_inst *inst,
{ {
struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data; struct v4l2_requestbuffers *b = (struct v4l2_requestbuffers *)data;
/* disallow */
if (b->type == OUTPUT_MPLANE || b->type == OUTPUT_META_PLANE) {
i_vpr_e(inst, "%s: (%s) not allowed for (%s) port\n",
__func__, event_name(event), v4l2_type_name(b->type));
return -EBUSY;
}
rc = msm_vidc_reqbufs(inst, b); rc = msm_vidc_reqbufs(inst, b);
if (rc) if (rc)
return rc; return rc;