evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: sde: move config validation earlier to stream on"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-05 02:08:59 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6b5c6d44ea
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c
View file

@ -416,23 +416,10 @@ static int sde_rotator_start_streaming(struct vb2_queue *q, unsigned int count)
{
struct sde_rotator_ctx *ctx = vb2_get_drv_priv(q);
struct sde_rotator_device *rot_dev = ctx->rot_dev;
struct sde_rotation_config config;
int ret;
SDEDEV_DBG(rot_dev->dev, "start streaming s:%d t:%d\n",
ctx->session_id, q->type);
sde_rot_mgr_lock(rot_dev->mgr);
sde_rotator_get_config_from_ctx(ctx, &config);
ret = sde_rotator_session_config(rot_dev->mgr, ctx->private, &config);
sde_rot_mgr_unlock(rot_dev->mgr);
if (ret < 0) {
SDEDEV_ERR(rot_dev->dev,
"fail config in stream on s:%d t:%d r:%d\n",
ctx->session_id, q->type, ret);
return -EINVAL;
}
if (!IS_ERR_OR_NULL(ctx->request) ||
atomic_read(&ctx->command_pending))
SDEDEV_ERR(rot_dev->dev,
@ -1501,11 +1488,39 @@ static int sde_rotator_streamon(struct file *file,
void *fh, enum v4l2_buf_type buf_type)
{
struct sde_rotator_ctx *ctx = sde_rotator_ctx_from_fh(fh);
struct sde_rotator_device *rot_dev = ctx->rot_dev;
struct sde_rotation_config config;
struct vb2_queue *vq;
int ret;
SDEDEV_DBG(ctx->rot_dev->dev, "stream on s:%d t:%d\n",
ctx->session_id, buf_type);
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT ?
V4L2_BUF_TYPE_VIDEO_CAPTURE :
V4L2_BUF_TYPE_VIDEO_OUTPUT);
if (!vq) {
SDEDEV_ERR(ctx->rot_dev->dev, "fail to get vq on s:%d t:%d\n",
ctx->session_id, buf_type);
return -EINVAL;
}
if (vb2_is_streaming(vq)) {
sde_rot_mgr_lock(rot_dev->mgr);
sde_rotator_get_config_from_ctx(ctx, &config);
ret = sde_rotator_session_config(rot_dev->mgr, ctx->private,
&config);
sde_rot_mgr_unlock(rot_dev->mgr);
if (ret < 0) {
SDEDEV_ERR(rot_dev->dev,
"fail config in stream on s:%d t:%d r:%d\n",
ctx->session_id, buf_type, ret);
return ret;
}
}
ret = v4l2_m2m_streamon(file, ctx->fh.m2m_ctx, buf_type);
if (ret < 0)
SDEDEV_ERR(ctx->rot_dev->dev, "fail stream on s:%d t:%d\n",