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

Revert "video: driver: utilize v4l2_m2m_ioctl_streamon helper function"

Browse Source 
This reverts commit e5189157f1.

Change-Id: I33e6e45ea6a08370ef8b80cddce9916bf08e613f
Signed-off-by: Deepa Guthyappa Madivalara <quic_dmadival@quicinc.com>
This commit is contained in:
Deepa Guthyappa Madivalara
2022-02-16 15:46:13 -08:00
parent 7373cc5efe
commit 43e71fff42
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
driver/vidc/inc/msm_vidc.h
View File

@@ -33,8 +33,7 @@ int msm_vidc_release_buffer(void *instance, int buffer_type,
int msm_vidc_qbuf(void *instance, struct media_device *mdev,
struct v4l2_buffer *b);
int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b);
int msm_vidc_streamon(void *instance, struct file *filp, void *fh,
enum v4l2_buf_type i);
int msm_vidc_streamon(void *instance, enum v4l2_buf_type i);
int msm_vidc_query_ctrl(void *instance, struct v4l2_queryctrl *ctrl);
int msm_vidc_query_menu(void *instance, struct v4l2_querymenu *qmenu);
int msm_vidc_streamoff(void *instance, enum v4l2_buf_type i);

2
driver/vidc/inc/msm_vidc_vb2.h
View File

@@ -34,7 +34,7 @@ void msm_vb2_unmap_dmabuf(void *buf_priv);
int msm_vidc_queue_setup(struct vb2_queue *q,
unsigned int *num_buffers, unsigned int *num_planes,
unsigned int sizes[], struct device *alloc_devs[]);
int msm_vidc_start_streaming(struct vb2_queue *q, unsigned int i);
int msm_vidc_start_streaming(struct vb2_queue *q, unsigned int count);
void msm_vidc_stop_streaming(struct vb2_queue *q);
void msm_vidc_buf_queue(struct vb2_buffer *vb2);
void msm_vidc_buf_cleanup(struct vb2_buffer *vb);

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

@@ -5,7 +5,6 @@
#include <linux/types.h>
#include <linux/hash.h>
#include <media/v4l2-mem2mem.h>
#include "msm_vidc_core.h"
#include "msm_vidc_inst.h"
#include "msm_vdec.h"
@@ -546,8 +545,7 @@ exit:
}
EXPORT_SYMBOL(msm_vidc_dqbuf);
int msm_vidc_streamon(void *instance, struct file *filp, void *fh,
enum v4l2_buf_type type)
int msm_vidc_streamon(void *instance, enum v4l2_buf_type type)
{
int rc = 0;
struct msm_vidc_inst *inst = instance;
@@ -571,12 +569,10 @@ int msm_vidc_streamon(void *instance, struct file *filp, void *fh,
rc = -EINVAL;
goto exit;
}
if (port == INPUT_PORT || port == OUTPUT_PORT)
rc = v4l2_m2m_ioctl_streamon(filp, fh, type);
else
rc = vb2_streamon(inst->bufq[port].vb2q, type);
if (rc) {
i_vpr_e(inst, "%s: streamon(%d) failed, %d\n",
i_vpr_e(inst, "%s: vb2_streamon(%d) failed, %d\n",
__func__, type, rc);
msm_vidc_change_inst_state(inst, MSM_VIDC_ERROR, __func__);
goto exit;

2
driver/vidc/src/msm_vidc_v4l2.c
View File

@@ -443,7 +443,7 @@ int msm_v4l2_streamon(struct file *filp, void *fh,
rc = -EBUSY;
goto unlock;
}
rc = msm_vidc_streamon((void *)inst, filp, fh, i);
rc = msm_vidc_streamon((void *)inst, i);
if (rc)
goto unlock;