[media] exynos4-is: Set valid initial format at FIMC-LITE

Ensure the image resolution and crop rectangle on the FIMC-LITE.n
subdevs and fimc-lite.n.capture video nodes is properly configured
upon the driver's initialization.

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>

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 993bd798f3d2b0dc85821a5f4bc805c835430905..4fa2e05186bd91a04d1a52a6e0e3567541f02eee 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1281,9 +1281,6 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
        int ret;
 
        memset(vfd, 0, sizeof(*vfd));
-
-       fimc->inp_frame.fmt = &fimc_lite_formats[0];
-       fimc->out_frame.fmt = &fimc_lite_formats[0];
        atomic_set(&fimc->out_path, FIMC_IO_DMA);
 
        snprintf(vfd->name, sizeof(vfd->name), "fimc-lite.%d.capture",
@@ -1399,6 +1396,23 @@ static const struct v4l2_ctrl_config fimc_lite_ctrl = {
        .step   = 1,
 };
 
+static void fimc_lite_set_default_config(struct fimc_lite *fimc)
+{
+       struct flite_frame *sink = &fimc->inp_frame;
+       struct flite_frame *source = &fimc->out_frame;
+
+       sink->fmt = &fimc_lite_formats[0];
+       sink->f_width = FLITE_DEFAULT_WIDTH;
+       sink->f_height = FLITE_DEFAULT_HEIGHT;
+
+       sink->rect.width = FLITE_DEFAULT_WIDTH;
+       sink->rect.height = FLITE_DEFAULT_HEIGHT;
+       sink->rect.left = 0;
+       sink->rect.top = 0;
+
+       *source = *sink;
+}
+
 static int fimc_lite_create_capture_subdev(struct fimc_lite *fimc)
 {
        struct v4l2_ctrl_handler *handler = &fimc->ctrl_handler;
@@ -1544,8 +1558,11 @@ static int fimc_lite_probe(struct platform_device *pdev)
                ret = PTR_ERR(fimc->alloc_ctx);
                goto err_pm;
        }
+
        pm_runtime_put(dev);
 
+       fimc_lite_set_default_config(fimc);
+
        dev_dbg(dev, "FIMC-LITE.%d registered successfully\n",
                fimc->index);
        return 0;

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h
index c98f3da7487030e75952db15dd4cd6bbb4d3472a..7428b2d22b529f97720fd7fbc0922ac4e80c6b22 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.h
+++ b/drivers/media/platform/exynos4-is/fimc-lite.h
@@ -29,6 +29,8 @@
 #define FLITE_CLK_NAME         "flite"
 #define FIMC_LITE_MAX_DEVS     3
 #define FLITE_REQ_BUFS_MIN     2
+#define FLITE_DEFAULT_WIDTH    640
+#define FLITE_DEFAULT_HEIGHT   480
 
 /* Bit index definitions for struct fimc_lite::state */
 enum {