diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-10-10 10:40:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-11 07:03:33 -0200 |
| commit | af15d025ecdf35ad1eb438595727d80155d8d28e (patch) | |
| tree | e65acd059e949ea7c60890546d1cd449909b424b /drivers/staging/media/omap4iss/iss_resizer.c | |
| parent | 6016498f2b9d72b4f813d7349f0621ccc92c4f5a (diff) | |
| download | linux-af15d025ecdf35ad1eb438595727d80155d8d28e.tar.gz linux-af15d025ecdf35ad1eb438595727d80155d8d28e.tar.bz2 linux-af15d025ecdf35ad1eb438595727d80155d8d28e.zip | |
[media] v4l: omap4iss: Enable/disabling the ISP interrupts globally
ISP interrupts are enabled/disabled when starting/stopping the IPIPEIF
or resizer. This doesn't permit using the two modules in separate
pipelines. Fix it by enabling/disabling the ISP interrupts at the same
time as the ISS interrupts, in the ISS device get/put operations.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_resizer.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_resizer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index 9dbf0185a86d..4673c0577886 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -256,8 +256,6 @@ static void resizer_configure(struct iss_resizer_device *resizer) } else { iss_reg_write(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_420, 0); } - - omap4iss_isp_enable_interrupts(iss); } /* ----------------------------------------------------------------------------- @@ -419,7 +417,6 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable) ret = -ETIMEDOUT; resizer_enable(resizer, 0); - omap4iss_isp_disable_interrupts(iss); iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_SYSCONFIG, RSZ_SYSCONFIG_RSZA_CLK_EN); iss_reg_clr(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_GCK_SDR, |