| From 2d246327438285c053b65c70769ad3941d5fbf36 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= |
| <niklas.soderlund+renesas@ragnatech.se> |
| Date: Sat, 14 Apr 2018 07:57:14 -0400 |
| Subject: [PATCH 1300/1795] media: rcar-vin: add flag to switch to media |
| controller mode |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| On Gen3 a media controller API needs to be used to allow userspace to |
| configure the subdevices in the pipeline instead of directly controlling |
| a single source subdevice, which is and will continue to be the mode of |
| operation on Gen2. |
| |
| Prepare for these two modes of operation by adding a flag to struct |
| rvin_info which will control which mode to use. |
| |
| Signed-off-by: Niklas Sรถderlund <niklas.soderlund+renesas@ragnatech.se> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| (cherry picked from commit 47ba5bbfd9ec7150cbc6e0205b4d5524b1ba2be9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/media/platform/rcar-vin/rcar-core.c | 6 +++++- |
| drivers/media/platform/rcar-vin/rcar-vin.h | 2 ++ |
| 2 files changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c |
| index 021e66cca187..9d5b1d152286 100644 |
| --- a/drivers/media/platform/rcar-vin/rcar-core.c |
| +++ b/drivers/media/platform/rcar-vin/rcar-core.c |
| @@ -249,18 +249,21 @@ static int rvin_digital_graph_init(struct rvin_dev *vin) |
| |
| static const struct rvin_info rcar_info_h1 = { |
| .model = RCAR_H1, |
| + .use_mc = false, |
| .max_width = 2048, |
| .max_height = 2048, |
| }; |
| |
| static const struct rvin_info rcar_info_m1 = { |
| .model = RCAR_M1, |
| + .use_mc = false, |
| .max_width = 2048, |
| .max_height = 2048, |
| }; |
| |
| static const struct rvin_info rcar_info_gen2 = { |
| .model = RCAR_GEN2, |
| + .use_mc = false, |
| .max_width = 2048, |
| .max_height = 2048, |
| }; |
| @@ -355,7 +358,8 @@ static int rcar_vin_remove(struct platform_device *pdev) |
| v4l2_async_notifier_unregister(&vin->notifier); |
| v4l2_async_notifier_cleanup(&vin->notifier); |
| |
| - v4l2_ctrl_handler_free(&vin->ctrl_handler); |
| + if (!vin->info->use_mc) |
| + v4l2_ctrl_handler_free(&vin->ctrl_handler); |
| |
| rvin_dma_unregister(vin); |
| |
| diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h |
| index c19ddc5e08cb..e5668c1120a6 100644 |
| --- a/drivers/media/platform/rcar-vin/rcar-vin.h |
| +++ b/drivers/media/platform/rcar-vin/rcar-vin.h |
| @@ -75,11 +75,13 @@ struct rvin_graph_entity { |
| /** |
| * struct rvin_info - Information about the particular VIN implementation |
| * @model: VIN model |
| + * @use_mc: use media controller instead of controlling subdevice |
| * @max_width: max input width the VIN supports |
| * @max_height: max input height the VIN supports |
| */ |
| struct rvin_info { |
| enum model_id model; |
| + bool use_mc; |
| |
| unsigned int max_width; |
| unsigned int max_height; |
| -- |
| 2.19.0 |
| |
