summaryrefslogtreecommitdiff
path: root/patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch')
-rw-r--r--patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch b/patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch
new file mode 100644
index 00000000000..bfb433d87f4
--- /dev/null
+++ b/patches.tizen/0283-media-exynos4-is-Set-valid-initial-format-on-FIMC.n-.patch
@@ -0,0 +1,77 @@
+From 85aee2ab3692fc345b0c8866e9b5c6e819680fdc Mon Sep 17 00:00:00 2001
+From: Sylwester Nawrocki <s.nawrocki@samsung.com>
+Date: Tue, 18 Jun 2013 14:56:11 -0300
+Subject: [PATCH 0283/1302] [media] exynos4-is: Set valid initial format on
+ FIMC.n subdevs
+
+Ensure there are valid initial image formats on the FIMC.n subdev pads.
+
+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>
+Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
+---
+ drivers/media/platform/exynos4-is/fimc-capture.c | 19 +++++++++++++++++--
+ drivers/media/platform/exynos4-is/fimc-core.h | 2 ++
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
+index 2b045b6..fb27ff7 100644
+--- a/drivers/media/platform/exynos4-is/fimc-capture.c
++++ b/drivers/media/platform/exynos4-is/fimc-capture.c
+@@ -1722,8 +1722,8 @@ static int fimc_capture_set_default_format(struct fimc_dev *fimc)
+ struct v4l2_format fmt = {
+ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
+ .fmt.pix_mp = {
+- .width = 640,
+- .height = 480,
++ .width = FIMC_DEFAULT_WIDTH,
++ .height = FIMC_DEFAULT_HEIGHT,
+ .pixelformat = V4L2_PIX_FMT_YUYV,
+ .field = V4L2_FIELD_NONE,
+ .colorspace = V4L2_COLORSPACE_JPEG,
+@@ -1741,6 +1741,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
+ struct vb2_queue *q = &fimc->vid_cap.vbq;
+ struct fimc_ctx *ctx;
+ struct fimc_vid_cap *vid_cap;
++ struct fimc_fmt *fmt;
+ int ret = -ENOMEM;
+
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+@@ -1788,6 +1789,20 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
+ if (ret)
+ goto err_free_ctx;
+
++ /* Default format configuration */
++ fmt = fimc_find_format(NULL, NULL, FMT_FLAGS_CAM, 0);
++ vid_cap->ci_fmt.width = FIMC_DEFAULT_WIDTH;
++ vid_cap->ci_fmt.height = FIMC_DEFAULT_HEIGHT;
++ vid_cap->ci_fmt.code = fmt->mbus_code;
++
++ ctx->s_frame.width = FIMC_DEFAULT_WIDTH;
++ ctx->s_frame.height = FIMC_DEFAULT_HEIGHT;
++ ctx->s_frame.fmt = fmt;
++
++ fmt = fimc_find_format(NULL, NULL, FMT_FLAGS_WRITEBACK, 0);
++ vid_cap->wb_fmt = vid_cap->ci_fmt;
++ vid_cap->wb_fmt.code = fmt->mbus_code;
++
+ vid_cap->vd_pad.flags = MEDIA_PAD_FL_SINK;
+ ret = media_entity_init(&vfd->entity, 1, &vid_cap->vd_pad, 0);
+ if (ret)
+diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
+index 0f25ce0..65c8ce7 100644
+--- a/drivers/media/platform/exynos4-is/fimc-core.h
++++ b/drivers/media/platform/exynos4-is/fimc-core.h
+@@ -47,6 +47,8 @@
+ #define FIMC_DEF_MIN_SIZE 16
+ #define FIMC_DEF_HEIGHT_ALIGN 2
+ #define FIMC_DEF_HOR_OFFS_ALIGN 1
++#define FIMC_DEFAULT_WIDTH 640
++#define FIMC_DEFAULT_HEIGHT 480
+
+ /* indices to the clocks array */
+ enum {
+--
+1.8.3.2
+