hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] atmel-isi: move configure_geometry() to start_streaming() 

As in set_fmt() function we only need to know which format is been set,
we don't need to access the ISI hardware in this moment.

So move the configure_geometry(), which access the ISI hardware, to
start_streaming() will make code more consistent and simpler.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Josh Wu 2015-09-11 04:00:15 -03:00 committed by Mauro Carvalho Chehab
parent ad5f9d1968
commit f653da3457
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/platform/soc_camera/atmel-isi.c
View File

@ -390,6 +390,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
/* Disable all interrupts */ /* Disable all interrupts */
isi_writel(isi, ISI_INTDIS, (u32)~0UL); isi_writel(isi, ISI_INTDIS, (u32)~0UL);
ret = configure_geometry(isi, icd->user_width, icd->user_height,
icd->current_fmt->code);
if (ret < 0)
return ret;
spin_lock_irq(&isi->lock); spin_lock_irq(&isi->lock);
/* Clear any pending interrupt */ /* Clear any pending interrupt */
isi_readl(isi, ISI_STATUS); isi_readl(isi, ISI_STATUS);
@ -477,8 +482,6 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
static int isi_camera_set_fmt(struct soc_camera_device *icd, static int isi_camera_set_fmt(struct soc_camera_device *icd,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv;
struct v4l2_subdev *sd = soc_camera_to_subdev(icd); struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
const struct soc_camera_format_xlate *xlate; const struct soc_camera_format_xlate *xlate;
struct v4l2_pix_format *pix = &f->fmt.pix; struct v4l2_pix_format *pix = &f->fmt.pix;
@ -511,16 +514,6 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd,
if (mf->code != xlate->code) if (mf->code != xlate->code)
return -EINVAL; return -EINVAL;
/* Enable PM and peripheral clock before operate isi registers */
pm_runtime_get_sync(ici->v4l2_dev.dev);
ret = configure_geometry(isi, pix->width, pix->height, xlate->code);
pm_runtime_put(ici->v4l2_dev.dev);
if (ret < 0)
return ret;
pix->width = mf->width; pix->width = mf->width;
pix->height = mf->height; pix->height = mf->height;
pix->field = mf->field; pix->field = mf->field;