diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-08-14 09:46:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-01 19:25:32 -0400 |
commit | b9ee31e621128ef7ad112daaba215357223b8cdd (patch) | |
tree | 06e8817add0f8abdcf60a1ae50f1283f2aa102a1 /include/media | |
parent | b5146c96d1795ed75bb90dc4d3189b2c4206c56d (diff) |
[media] s5p-fimc: Add pipeline ops to separate FIMC-LITE module
In order to reuse the FIMC-LITE module on Exynos4 and Exynos5
SoC introduce a set of callbacks for the media pipeline control
from within FIMC/FIMC-LITE video node. It lets us avoid symbol
dependencies between FIMC-LITE and the whole media device driver,
which simplifies the initialization sequences and doesn't
introduce issues preventing common kernel image for exynos4 and
exynos5 SoCs.
This patch also corrects following build errors:
drivers/built-in.o: In function `buffer_queue':
drivers/media/video/s5p-fimc/fimc-lite.c:414: undefined reference
to `fimc_pipeline_s_stream'
drivers/built-in.o: In function `fimc_lite_resume':
drivers/media/video/s5p-fimc/fimc-lite.c:1518: undefined reference
to `fimc_pipeline_initialize'
drivers/built-in.o: In function `fimc_lite_suspend':
drivers/media/video/s5p-fimc/fimc-lite.c:1544: undefined reference
to `fimc_pipeline_shutdown'
when only CONFIG_VIDEO_EXYNOS_FIMC_LITE is selected, without
CONFIG_VIDEO_S5P_FIMC.
Reported-by: Sachin Kamat <sachin.kamat@linaro.org>
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 'include/media')
-rw-r--r-- | include/media/s5p_fimc.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h index 8587aaf73646..09421a611d73 100644 --- a/include/media/s5p_fimc.h +++ b/include/media/s5p_fimc.h | |||
@@ -12,6 +12,8 @@ | |||
12 | #ifndef S5P_FIMC_H_ | 12 | #ifndef S5P_FIMC_H_ |
13 | #define S5P_FIMC_H_ | 13 | #define S5P_FIMC_H_ |
14 | 14 | ||
15 | #include <media/media-entity.h> | ||
16 | |||
15 | enum cam_bus_type { | 17 | enum cam_bus_type { |
16 | FIMC_ITU_601 = 1, | 18 | FIMC_ITU_601 = 1, |
17 | FIMC_ITU_656, | 19 | FIMC_ITU_656, |
@@ -80,4 +82,20 @@ struct fimc_pipeline { | |||
80 | struct media_pipeline *m_pipeline; | 82 | struct media_pipeline *m_pipeline; |
81 | }; | 83 | }; |
82 | 84 | ||
85 | /* | ||
86 | * Media pipeline operations to be called from within the fimc(-lite) | ||
87 | * video node when it is the last entity of the pipeline. Implemented | ||
88 | * by corresponding media device driver. | ||
89 | */ | ||
90 | struct fimc_pipeline_ops { | ||
91 | int (*open)(struct fimc_pipeline *p, struct media_entity *me, | ||
92 | bool resume); | ||
93 | int (*close)(struct fimc_pipeline *p); | ||
94 | int (*set_stream)(struct fimc_pipeline *p, bool state); | ||
95 | }; | ||
96 | |||
97 | #define fimc_pipeline_call(f, op, p, args...) \ | ||
98 | (!(f) ? -ENODEV : (((f)->pipeline_ops && (f)->pipeline_ops->op) ? \ | ||
99 | (f)->pipeline_ops->op((p), ##args) : -ENOIOCTLCMD)) | ||
100 | |||
83 | #endif /* S5P_FIMC_H_ */ | 101 | #endif /* S5P_FIMC_H_ */ |