hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/platform/exynos4-is/fimc-core.h
....@@ -1,9 +1,6 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * 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.
74 */
85
96 #ifndef FIMC_CORE_H_
....@@ -299,11 +296,8 @@
299296 * @buf_index: index for managing the output DMA buffers
300297 * @frame_count: the frame counter for statistics
301298 * @reqbufs_count: the number of buffers requested in REQBUFS ioctl
302
- * @input_index: input (camera sensor) index
303299 * @input: capture input type, grp_id of the attached subdev
304300 * @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
307301 */
308302 struct fimc_vid_cap {
309303 struct fimc_ctx *ctx;
....@@ -322,10 +316,8 @@
322316 unsigned int frame_count;
323317 unsigned int reqbufs_count;
324318 bool streaming;
325
- int input_index;
326319 u32 input;
327320 bool user_subdev_api;
328
- bool inh_sensor_ctrls;
329321 };
330322
331323 /**
....@@ -596,12 +588,14 @@
596588 {
597589 struct fimc_frame *frame;
598590
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) {
600593 if (fimc_ctx_state_is_set(FIMC_CTX_M2M, ctx))
601594 frame = &ctx->s_frame;
602595 else
603596 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) {
605599 frame = &ctx->d_frame;
606600 } else {
607601 v4l2_err(ctx->fimc_dev->v4l2_dev,