iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rcar-vin: add flag to switch to media controller mode

Browse Source 
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>
This commit is contained in:
Niklas Söderlund 2018-04-14 07:57:14 -04:00 committed by Mauro Carvalho Chehab
parent 90dedce9bc
commit 47ba5bbfd9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/rcar-vin/rcar-core.c
View File

@ -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);

2
drivers/media/platform/rcar-vin/rcar-vin.h
View File

@ -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;