.. | .. |
---|
| 1 | +/* SPDX-License-Identifier: GPL-2.0-only */ |
---|
1 | 2 | /* |
---|
2 | 3 | * Copyright (C) 2010 - 2012 Samsung Electronics Co., Ltd. |
---|
3 | | - * |
---|
4 | | - * This program is free software; you can redistribute it and/or modify |
---|
5 | | - * it under the terms of the GNU General Public License version 2 as |
---|
6 | | - * published by the Free Software Foundation. |
---|
7 | 4 | */ |
---|
8 | 5 | |
---|
9 | 6 | #ifndef FIMC_CORE_H_ |
---|
.. | .. |
---|
299 | 296 | * @buf_index: index for managing the output DMA buffers |
---|
300 | 297 | * @frame_count: the frame counter for statistics |
---|
301 | 298 | * @reqbufs_count: the number of buffers requested in REQBUFS ioctl |
---|
302 | | - * @input_index: input (camera sensor) index |
---|
303 | 299 | * @input: capture input type, grp_id of the attached subdev |
---|
304 | 300 | * @user_subdev_api: true if subdevs are not configured by the host driver |
---|
305 | | - * @inh_sensor_ctrls: a flag indicating v4l2 controls are inherited from |
---|
306 | | - * an image sensor subdev |
---|
307 | 301 | */ |
---|
308 | 302 | struct fimc_vid_cap { |
---|
309 | 303 | struct fimc_ctx *ctx; |
---|
.. | .. |
---|
322 | 316 | unsigned int frame_count; |
---|
323 | 317 | unsigned int reqbufs_count; |
---|
324 | 318 | bool streaming; |
---|
325 | | - int input_index; |
---|
326 | 319 | u32 input; |
---|
327 | 320 | bool user_subdev_api; |
---|
328 | | - bool inh_sensor_ctrls; |
---|
329 | 321 | }; |
---|
330 | 322 | |
---|
331 | 323 | /** |
---|
.. | .. |
---|
596 | 588 | { |
---|
597 | 589 | struct fimc_frame *frame; |
---|
598 | 590 | |
---|
599 | | - if (V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE == type) { |
---|
| 591 | + if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE || |
---|
| 592 | + type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { |
---|
600 | 593 | if (fimc_ctx_state_is_set(FIMC_CTX_M2M, ctx)) |
---|
601 | 594 | frame = &ctx->s_frame; |
---|
602 | 595 | else |
---|
603 | 596 | return ERR_PTR(-EINVAL); |
---|
604 | | - } else if (V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE == type) { |
---|
| 597 | + } else if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE || |
---|
| 598 | + type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { |
---|
605 | 599 | frame = &ctx->d_frame; |
---|
606 | 600 | } else { |
---|
607 | 601 | v4l2_err(ctx->fimc_dev->v4l2_dev, |
---|