diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-04-02 06:41:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 09:27:16 -0300 |
| commit | 9448ab7dec30489d5318f786d0faee08354ef3d5 (patch) | |
| tree | 0b77b5beed4edce688b12ba5cddbd82f0e0dd1a7 /drivers/media/video/s5p-fimc/fimc-capture.c | |
| parent | 0c9204d3427015a22fa90b865b6317fed337810b (diff) | |
| download | op-kernel-dev-9448ab7dec30489d5318f786d0faee08354ef3d5.zip op-kernel-dev-9448ab7dec30489d5318f786d0faee08354ef3d5.tar.gz | |
[media] s5p-fimc: Add color effect control
Add support for V4L2_CID_COLORFX control at the mem-to-mem and capture
video nodes.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-capture.c')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-capture.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 6d079ac..12415e7 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -62,7 +62,7 @@ static int fimc_capture_hw_init(struct fimc_dev *fimc) fimc_hw_set_mainscaler(ctx); fimc_hw_set_target_format(ctx); fimc_hw_set_rotation(ctx); - fimc_hw_set_effect(ctx, false); + fimc_hw_set_effect(ctx); fimc_hw_set_output_path(ctx); fimc_hw_set_out_dma(ctx); if (fimc->variant->has_alpha) @@ -164,6 +164,7 @@ static int fimc_capture_config_update(struct fimc_ctx *ctx) fimc_hw_set_mainscaler(ctx); fimc_hw_set_target_format(ctx); fimc_hw_set_rotation(ctx); + fimc_hw_set_effect(ctx); fimc_prepare_dma_offset(ctx, &ctx->d_frame); fimc_hw_set_out_dma(ctx); if (fimc->variant->has_alpha) @@ -462,14 +463,14 @@ int fimc_capture_ctrls_create(struct fimc_dev *fimc) if (WARN_ON(vid_cap->ctx == NULL)) return -ENXIO; - if (vid_cap->ctx->ctrls_rdy) + if (vid_cap->ctx->ctrls.ready) return 0; ret = fimc_ctrls_create(vid_cap->ctx); - if (ret || vid_cap->user_subdev_api) + if (ret || vid_cap->user_subdev_api || !vid_cap->ctx->ctrls.ready) return ret; - return v4l2_ctrl_add_handler(&vid_cap->ctx->ctrl_handler, + return v4l2_ctrl_add_handler(&vid_cap->ctx->ctrls.handler, fimc->pipeline.subdevs[IDX_SENSOR]->ctrl_handler); } @@ -1588,7 +1589,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc, v4l2_info(v4l2_dev, "Registered %s as /dev/%s\n", vfd->name, video_device_node_name(vfd)); - vfd->ctrl_handler = &ctx->ctrl_handler; + vfd->ctrl_handler = &ctx->ctrls.handler; return 0; err_vd: |
