redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

media: rcar-vin: prepare for media controller mode initialization

Browse source 
Prepare for media controller by calling a different initialization then
when running in device centric mode. Add trivial configuration of
the mbus and creation of the media pad for the video device entity.

While we are at it clearly mark the digital device centric notifier
functions with a comment.

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:17 -04:00 committed by Mauro Carvalho Chehab
parent e812c94e30
commit 68ee48d666
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/media/platform/rcar-vin/rcar-core.c
View file

@ -46,6 +46,10 @@ static int rvin_find_pad(struct v4l2_subdev *sd, int direction)
return -EINVAL;
}
/* -----------------------------------------------------------------------------
* Digital async notifier
*/
/* The vin lock should be held when calling the subdevice attach and detach */
static int rvin_digital_subdevice_attach(struct rvin_dev *vin,
struct v4l2_subdev *subdev)
@ -243,6 +247,16 @@ static int rvin_digital_graph_init(struct rvin_dev *vin)
return 0;
}
static int rvin_mc_init(struct rvin_dev *vin)
{
/* All our sources are CSI-2 */
vin->mbus_cfg.type = V4L2_MBUS_CSI2;
vin->mbus_cfg.flags = 0;
vin->pad.flags = MEDIA_PAD_FL_SINK;
return media_entity_pads_init(&vin->vdev.entity, 1, &vin->pad);
}
/* -----------------------------------------------------------------------------
* Platform Device Driver
*/
@ -331,8 +345,10 @@ static int rcar_vin_probe(struct platform_device *pdev)
return ret;
platform_set_drvdata(pdev, vin);
ret = rvin_digital_graph_init(vin);
if (vin->info->use_mc)
ret = rvin_mc_init(vin);
else
ret = rvin_digital_graph_init(vin);
if (ret < 0)
goto error;

4
drivers/media/platform/rcar-vin/rcar-vin.h
View file

@ -99,6 +99,8 @@ struct rvin_info {
* @notifier: V4L2 asynchronous subdevs notifier
* @digital: entity in the DT for local digital subdevice
*
* @pad: media pad for the video device entity
*
* @lock: protects @queue
* @queue: vb2 buffers queue
* @scratch: cpu address for scratch buffer
@ -131,6 +133,8 @@ struct rvin_dev {
struct v4l2_async_notifier notifier;
struct rvin_graph_entity *digital;
struct media_pad pad;
struct mutex lock;
struct vb2_queue queue;
void *scratch;