Revert "video: driver: utilize v4l2_m2m_ioctl_streamon helper function"
This reverts commit e5189157f1
.
Change-Id: I33e6e45ea6a08370ef8b80cddce9916bf08e613f
Signed-off-by: Deepa Guthyappa Madivalara <quic_dmadival@quicinc.com>
This commit is contained in:
@@ -33,8 +33,7 @@ int msm_vidc_release_buffer(void *instance, int buffer_type,
|
|||||||
int msm_vidc_qbuf(void *instance, struct media_device *mdev,
|
int msm_vidc_qbuf(void *instance, struct media_device *mdev,
|
||||||
struct v4l2_buffer *b);
|
struct v4l2_buffer *b);
|
||||||
int msm_vidc_dqbuf(void *instance, 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,
|
int msm_vidc_streamon(void *instance, enum v4l2_buf_type i);
|
||||||
enum v4l2_buf_type i);
|
|
||||||
int msm_vidc_query_ctrl(void *instance, struct v4l2_queryctrl *ctrl);
|
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_query_menu(void *instance, struct v4l2_querymenu *qmenu);
|
||||||
int msm_vidc_streamoff(void *instance, enum v4l2_buf_type i);
|
int msm_vidc_streamoff(void *instance, enum v4l2_buf_type i);
|
||||||
|
@@ -34,7 +34,7 @@ void msm_vb2_unmap_dmabuf(void *buf_priv);
|
|||||||
int msm_vidc_queue_setup(struct vb2_queue *q,
|
int msm_vidc_queue_setup(struct vb2_queue *q,
|
||||||
unsigned int *num_buffers, unsigned int *num_planes,
|
unsigned int *num_buffers, unsigned int *num_planes,
|
||||||
unsigned int sizes[], struct device *alloc_devs[]);
|
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_stop_streaming(struct vb2_queue *q);
|
||||||
void msm_vidc_buf_queue(struct vb2_buffer *vb2);
|
void msm_vidc_buf_queue(struct vb2_buffer *vb2);
|
||||||
void msm_vidc_buf_cleanup(struct vb2_buffer *vb);
|
void msm_vidc_buf_cleanup(struct vb2_buffer *vb);
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/hash.h>
|
#include <linux/hash.h>
|
||||||
#include <media/v4l2-mem2mem.h>
|
|
||||||
#include "msm_vidc_core.h"
|
#include "msm_vidc_core.h"
|
||||||
#include "msm_vidc_inst.h"
|
#include "msm_vidc_inst.h"
|
||||||
#include "msm_vdec.h"
|
#include "msm_vdec.h"
|
||||||
@@ -546,8 +545,7 @@ exit:
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL(msm_vidc_dqbuf);
|
EXPORT_SYMBOL(msm_vidc_dqbuf);
|
||||||
|
|
||||||
int msm_vidc_streamon(void *instance, struct file *filp, void *fh,
|
int msm_vidc_streamon(void *instance, enum v4l2_buf_type type)
|
||||||
enum v4l2_buf_type type)
|
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
struct msm_vidc_inst *inst = instance;
|
struct msm_vidc_inst *inst = instance;
|
||||||
@@ -571,12 +569,10 @@ int msm_vidc_streamon(void *instance, struct file *filp, void *fh,
|
|||||||
rc = -EINVAL;
|
rc = -EINVAL;
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
if (port == INPUT_PORT || port == OUTPUT_PORT)
|
|
||||||
rc = v4l2_m2m_ioctl_streamon(filp, fh, type);
|
rc = vb2_streamon(inst->bufq[port].vb2q, type);
|
||||||
else
|
|
||||||
rc = vb2_streamon(inst->bufq[port].vb2q, type);
|
|
||||||
if (rc) {
|
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);
|
__func__, type, rc);
|
||||||
msm_vidc_change_inst_state(inst, MSM_VIDC_ERROR, __func__);
|
msm_vidc_change_inst_state(inst, MSM_VIDC_ERROR, __func__);
|
||||||
goto exit;
|
goto exit;
|
||||||
|
@@ -443,7 +443,7 @@ int msm_v4l2_streamon(struct file *filp, void *fh,
|
|||||||
rc = -EBUSY;
|
rc = -EBUSY;
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
rc = msm_vidc_streamon((void *)inst, filp, fh, i);
|
rc = msm_vidc_streamon((void *)inst, i);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto unlock;
|
goto unlock;
|
||||||
|
|
||||||
|
Referens i nytt ärende
Block a user