1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 2cc3b916672..510cfab477f 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -63,6 +63,8 @@ static int fimc_init_capture(struct fimc_dev *fimc)
                 fimc_hw_set_effect(ctx, false);
                 fimc_hw_set_output_path(ctx);
                 fimc_hw_set_out_dma(ctx);
+                if (fimc->variant->has_alpha)
+                        fimc_hw_set_rgb_alpha(ctx);
                 clear_bit(ST_CAPT_APPLY_CFG, &fimc->state);
         }
         spin_unlock_irqrestore(&fimc->slock, flags);
@@ -154,6 +156,8 @@ int fimc_capture_config_update(struct fimc_ctx *ctx)
                 fimc_hw_set_rotation(ctx);
                 fimc_prepare_dma_offset(ctx, &ctx->d_frame);
                 fimc_hw_set_out_dma(ctx);
+                if (fimc->variant->has_alpha)
+                        fimc_hw_set_rgb_alpha(ctx);
                 clear_bit(ST_CAPT_APPLY_CFG, &fimc->state);
         }
         spin_unlock(&ctx->slock);
@@ -812,6 +816,10 @@ static int fimc_capture_set_format(struct fimc_dev *fimc, struct v4l2_format *f)
                                           FIMC_SD_PAD_SOURCE);
         if (!ff->fmt)
                 return -EINVAL;
+
+        /* Update RGB Alpha control state and value range */
+        fimc_alpha_ctrl_update(ctx);
+
         /* Try to match format at the host and the sensor */
         if (!fimc->vid_cap.user_subdev_api) {
                 mf->code   = ff->fmt->mbus_code;
@@ -1235,6 +1243,9 @@ static int fimc_subdev_set_fmt(struct v4l2_subdev *sd,
                 *mf = fmt->format;
                 return 0;
         }
+        /* Update RGB Alpha control state and value range */
+        fimc_alpha_ctrl_update(ctx);
+
         fimc_capture_mark_jpeg_xfer(ctx, fimc_fmt_is_jpeg(ffmt->color));
 
         ff = fmt->pad == FIMC_SD_PAD_SINK ?