diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-07-23 10:30:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:25:17 -0500 |
| commit | cd73bb6c4e493cbe227f7861d96dd864a71fe5bc (patch) | |
| tree | ba1e0d50a10acb630b0d36f85bff94586e81bae8 /drivers/media/platform/omap3isp/ispresizer.h | |
| parent | d903a0a367f3e0350a3ba1455c0a7c533977fb42 (diff) | |
| download | linux-cd73bb6c4e493cbe227f7861d96dd864a71fe5bc.tar.bz2 | |
[media] omap3isp: resizer: Protect against races when updating crop
When updating the crop rectangle during streaming, the IRQ handler will
reprogram the resizer after the current frame. A race condition
currently exists between the set selection operation and the IRQ
handler: if the set selection operation is called twice in a row and the
IRQ handler runs only during the second call, it could reprogram the
hardware with partially updated values. Use a spinlock to protect
against that.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/ispresizer.h')
| -rw-r--r-- | drivers/media/platform/omap3isp/ispresizer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/ispresizer.h b/drivers/media/platform/omap3isp/ispresizer.h index 494f5a2fd4bb..5414542912e2 100644 --- a/drivers/media/platform/omap3isp/ispresizer.h +++ b/drivers/media/platform/omap3isp/ispresizer.h @@ -17,6 +17,7 @@ #ifndef OMAP3_ISP_RESIZER_H #define OMAP3_ISP_RESIZER_H +#include <linux/spinlock.h> #include <linux/types.h> /* @@ -86,6 +87,7 @@ enum resizer_input_entity { /* * struct isp_res_device - OMAP3 ISP resizer module + * @lock: Protects formats and crop rectangles between set_selection and IRQ * @crop.request: Crop rectangle requested by the user * @crop.active: Active crop rectangle (based on hardware requirements) */ @@ -106,6 +108,7 @@ struct isp_res_device { enum isp_pipeline_stream_state state; wait_queue_head_t wait; atomic_t stopping; + spinlock_t lock; struct { struct v4l2_rect request; |