| Message ID | 1341581569-8292-6-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Laurent, Thanks for the patches. Laurent Pinchart wrote: ... > @@ -817,7 +817,7 @@ static const struct preview_update update_attrs[] = { > offsetof(struct omap3isp_prev_update_config, dcor), > }, /* OMAP3ISP_PREV_GAMMABYPASS */ { > NULL, > - preview_enable_gammabypass, > + NULL, > }, /* OMAP3ISP_PREV_DRK_FRM_CAPTURE */ { > NULL, > preview_enable_drkframe_capture, > @@ -835,7 +835,7 @@ static const struct preview_update update_attrs[] = { > offsetof(struct omap3isp_prev_update_config, nf), > }, /* OMAP3ISP_PREV_GAMMA */ { > preview_config_gammacorrn, > - NULL, > + preview_enable_gammacorrn, > offsetof(struct prev_params, gamma), > FIELD_SIZEOF(struct prev_params, gamma), > offsetof(struct omap3isp_prev_update_config, gamma), Doesn't this change the behaviour of the user space API? I'm not sure if we _really_ need to worry about that _too_ much, but I think that if OMAP3ISP_PREV_GAMMABYPASS is no longer used anywhere the definition should be removed as well to prevent anyone accidentally from using it. Cheers,
Hi Sakari, On Friday 13 July 2012 12:51:36 Sakari Ailus wrote: > Laurent Pinchart wrote: > ... > > > @@ -817,7 +817,7 @@ static const struct preview_update update_attrs[] = { > > offsetof(struct omap3isp_prev_update_config, dcor), > > }, /* OMAP3ISP_PREV_GAMMABYPASS */ { > > NULL, > > - preview_enable_gammabypass, > > + NULL, > > }, /* OMAP3ISP_PREV_DRK_FRM_CAPTURE */ { > > NULL, > > preview_enable_drkframe_capture, > > @@ -835,7 +835,7 @@ static const struct preview_update update_attrs[] = { > > offsetof(struct omap3isp_prev_update_config, nf), > > }, /* OMAP3ISP_PREV_GAMMA */ { > > preview_config_gammacorrn, > > - NULL, > > + preview_enable_gammacorrn, > > offsetof(struct prev_params, gamma), > > FIELD_SIZEOF(struct prev_params, gamma), > > offsetof(struct omap3isp_prev_update_config, gamma), > > Doesn't this change the behaviour of the user space API? That's correct, it does. > I'm not sure if we _really_ need to worry about that _too_ much, but I > think that if OMAP3ISP_PREV_GAMMABYPASS is no longer used anywhere the > definition should be removed as well to prevent anyone accidentally from > using it. Good point. I'll replace it with a comment that warns not to use bit 11.
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index c325e79..71ce0f4 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c @@ -481,25 +481,6 @@ static void preview_enable_dcor(struct isp_prev_device *prev, bool enable) } /* - * preview_enable_gammabypass - Enable/disable Gamma Bypass - * - * When gamma bypass is enabled, the output of the gamma correction is the 8 MSB - * of the 10-bit input . - */ -static void -preview_enable_gammabypass(struct isp_prev_device *prev, bool enable) -{ - struct isp_device *isp = to_isp_device(prev); - - if (enable) - isp_reg_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, - ISPPRV_PCR_GAMMA_BYPASS); - else - isp_reg_clr(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, - ISPPRV_PCR_GAMMA_BYPASS); -} - -/* * preview_enable_drkframe_capture - Enable/disable Dark Frame Capture */ static void @@ -597,6 +578,25 @@ preview_config_gammacorrn(struct isp_prev_device *prev, } /* + * preview_enable_gammacorrn - Enable/disable Gamma Correction + * + * When gamma correction is disabled, the module is bypassed and its output is + * the 8 MSB of the 10-bit input . + */ +static void +preview_enable_gammacorrn(struct isp_prev_device *prev, bool enable) +{ + struct isp_device *isp = to_isp_device(prev); + + if (enable) + isp_reg_clr(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, + ISPPRV_PCR_GAMMA_BYPASS); + else + isp_reg_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, + ISPPRV_PCR_GAMMA_BYPASS); +} + +/* * preview_config_contrast - Configure the Contrast * * Value should be programmed before enabling the module. @@ -817,7 +817,7 @@ static const struct preview_update update_attrs[] = { offsetof(struct omap3isp_prev_update_config, dcor), }, /* OMAP3ISP_PREV_GAMMABYPASS */ { NULL, - preview_enable_gammabypass, + NULL, }, /* OMAP3ISP_PREV_DRK_FRM_CAPTURE */ { NULL, preview_enable_drkframe_capture, @@ -835,7 +835,7 @@ static const struct preview_update update_attrs[] = { offsetof(struct omap3isp_prev_update_config, nf), }, /* OMAP3ISP_PREV_GAMMA */ { preview_config_gammacorrn, - NULL, + preview_enable_gammacorrn, offsetof(struct prev_params, gamma), FIELD_SIZEOF(struct prev_params, gamma), offsetof(struct omap3isp_prev_update_config, gamma),
Enabling gamma bypass disables gamma correction and vice versa. Merge the two parameters. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/video/omap3isp/isppreview.c | 42 ++++++++++++++-------------- 1 files changed, 21 insertions(+), 21 deletions(-)