Re: [PATCH 2/2] [media] omap3isp: separate links creation from entities init
From: Mauro Carvalho Chehab
Date: Wed Aug 26 2015 - 16:43:48 EST
Em Wed, 26 Aug 2015 17:25:19 +0200
Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx> escreveu:
> The omap3isp driver initializes the entities and creates the pads links
> before the entities are registered with the media device. This does not
> work now that object IDs are used to create links so the media_device
> has to be set.
>
> Split out the pads links creation from the entity initialization so are
> made after the entities registration.
>
> Suggested-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> Signed-off-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
Did some tests there on a Beagleboard.
That's what media-ctl reports before the patches:
digraph board {
rankdir=TB
n00000001 [label="{{<port0> 0} | OMAP3 ISP CCP2 | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000001:port1 -> n00000005:port0 [style=dashed]
n00000002 [label="OMAP3 ISP CCP2 input\n/dev/video0", shape=box, style=filled, fillcolor=yellow]
n00000002 -> n00000001:port0 [style=dashed]
n00000003 [label="{{<port0> 0} | OMAP3 ISP CSI2a | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000003:port1 -> n00000004 [style=dashed]
n00000003:port1 -> n00000005:port0 [style=dashed]
n00000004 [label="OMAP3 ISP CSI2a output\n/dev/video1", shape=box, style=filled, fillcolor=yellow]
n00000005 [label="{{<port0> 0} | OMAP3 ISP CCDC | {<port1> 1 | <port2> 2}}", shape=Mrecord, style=filled, fillcolor=green]
n00000005:port1 -> n00000006 [style=dashed]
n00000005:port2 -> n00000007:port0 [style=dashed]
n00000005:port1 -> n0000000a:port0 [style=dashed]
n00000005:port2 -> n0000000d:port0 [style=bold]
n00000005:port2 -> n0000000e:port0 [style=bold]
n00000005:port2 -> n0000000f:port0 [style=bold]
n00000006 [label="OMAP3 ISP CCDC output\n/dev/video2", shape=box, style=filled, fillcolor=yellow]
n00000007 [label="{{<port0> 0} | OMAP3 ISP preview | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000007:port1 -> n00000009 [style=dashed]
n00000007:port1 -> n0000000a:port0 [style=dashed]
n00000008 [label="OMAP3 ISP preview input\n/dev/video3", shape=box, style=filled, fillcolor=yellow]
n00000008 -> n00000007:port0 [style=dashed]
n00000009 [label="OMAP3 ISP preview output\n/dev/video4", shape=box, style=filled, fillcolor=yellow]
n0000000a [label="{{<port0> 0} | OMAP3 ISP resizer | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000a:port1 -> n0000000c [style=dashed]
n0000000b [label="OMAP3 ISP resizer input\n/dev/video5", shape=box, style=filled, fillcolor=yellow]
n0000000b -> n0000000a:port0 [style=dashed]
n0000000c [label="OMAP3 ISP resizer output\n/dev/video6", shape=box, style=filled, fillcolor=yellow]
n0000000d [label="{{<port0> 0} | OMAP3 ISP AEWB | {}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000e [label="{{<port0> 0} | OMAP3 ISP AF | {}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000f [label="{{<port0> 0} | OMAP3 ISP histogram | {}}", shape=Mrecord, style=filled, fillcolor=green]
}
And those are what's reported after the changes:
digraph board {
rankdir=TB
n00000001 [label="{{<port0> 0} | OMAP3 ISP CCP2 | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000001:port1 -> n00000005:port0 [style=dashed]
n00000002 [label="OMAP3 ISP CCP2 input\n/dev/video0", shape=box, style=filled, fillcolor=yellow]
n00000002 -> n00000001:port0 [style=dashed]
n00000003 [label="{{<port0> 0} | OMAP3 ISP CSI2a | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000003:port1 -> n00000004 [style=dashed]
n00000003:port1 -> n00000005:port0 [style=dashed]
n00000004 [label="OMAP3 ISP CSI2a output\n/dev/video1", shape=box, style=filled, fillcolor=yellow]
n00000005 [label="{{<port0> 0} | OMAP3 ISP CCDC | {<port1> 1 | <port2> 2}}", shape=Mrecord, style=filled, fillcolor=green]
n00000005:port1 -> n00000006 [style=dashed]
n00000005:port2 -> n00000007:port0 [style=dashed]
n00000005:port1 -> n0000000a:port0 [style=dashed]
n00000005:port2 -> n0000000d:port0 [style=bold]
n00000005:port2 -> n0000000e:port0 [style=bold]
n00000005:port2 -> n0000000f:port0 [style=bold]
n00000006 [label="OMAP3 ISP CCDC output\n/dev/video2", shape=box, style=filled, fillcolor=yellow]
n00000007 [label="{{<port0> 0} | OMAP3 ISP preview | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n00000007:port1 -> n00000009 [style=dashed]
n00000007:port1 -> n0000000a:port0 [style=dashed]
n00000008 [label="OMAP3 ISP preview input\n/dev/video3", shape=box, style=filled, fillcolor=yellow]
n00000008 -> n00000007:port0 [style=dashed]
n00000009 [label="OMAP3 ISP preview output\n/dev/video4", shape=box, style=filled, fillcolor=yellow]
n0000000a [label="{{<port0> 0} | OMAP3 ISP resizer | {<port1> 1}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000a:port1 -> n0000000c [style=dashed]
n0000000b [label="OMAP3 ISP resizer input\n/dev/video5", shape=box, style=filled, fillcolor=yellow]
n0000000b -> n0000000a:port0 [style=dashed]
n0000000c [label="OMAP3 ISP resizer output\n/dev/video6", shape=box, style=filled, fillcolor=yellow]
n0000000d [label="{{<port0> 0} | OMAP3 ISP AEWB | {}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000e [label="{{<port0> 0} | OMAP3 ISP AF | {}}", shape=Mrecord, style=filled, fillcolor=green]
n0000000f [label="{{<port0> 0} | OMAP3 ISP histogram | {}}", shape=Mrecord, style=filled, fillcolor=green]
}
With is exactly the same graph.
I also ran the my G_TOPOLOGY tool. Of course, it fails before the
patches, working properly after them.
After the patches, it reports entities, links, pads, interfaces and
interface links as it should be:
$ mc_nextgen_test -e -i -I -l
version: 80number of entities: 15
number of interfaces: 7
number of pads: 21
number of links: 37
entity entity#1: OMAP3 ISP CCP2, 2 pad(s), 1 source(s)
entity entity#2: OMAP3 ISP CCP2 input, 1 pad(s)
entity entity#3: OMAP3 ISP CSI2a, 2 pad(s), 1 source(s)
entity entity#4: OMAP3 ISP CSI2a output, 1 pad(s)
entity entity#5: OMAP3 ISP CCDC, 3 pad(s), 2 source(s)
entity entity#6: OMAP3 ISP CCDC output, 1 pad(s)
entity entity#7: OMAP3 ISP preview, 2 pad(s), 1 source(s)
entity entity#8: OMAP3 ISP preview input, 1 pad(s)
entity entity#9: OMAP3 ISP preview output, 1 pad(s)
entity entity#10: OMAP3 ISP resizer, 2 pad(s), 1 source(s)
entity entity#11: OMAP3 ISP resizer input, 1 pad(s)
entity entity#12: OMAP3 ISP resizer output, 1 pad(s)
entity entity#13: OMAP3 ISP AEWB, 1 pad(s)
entity entity#14: OMAP3 ISP AF, 1 pad(s)
entity entity#15: OMAP3 ISP histogram, 1 pad(s)
interface intf_devnode#1: video (81,0)
interface intf_devnode#2: video (81,1)
interface intf_devnode#3: video (81,2)
interface intf_devnode#4: video (81,3)
interface intf_devnode#5: video (81,4)
interface intf_devnode#6: video (81,5)
interface intf_devnode#7: video (81,6)
interface link link#1: intf_devnode#1 <=> entity#2
interface link link#2: intf_devnode#2 <=> entity#4
interface link link#3: intf_devnode#3 <=> entity#6
interface link link#4: intf_devnode#4 <=> entity#8
interface link link#5: intf_devnode#5 <=> entity#9
interface link link#6: intf_devnode#6 <=> entity#11
interface link link#7: intf_devnode#7 <=> entity#12
data link link#8: pad#5 => pad#6
data link link#9: pad#5 => pad#6
data link link#10: pad#3 => pad#1
data link link#11: pad#3 => pad#1
data link link#12: pad#8 => pad#10
data link link#13: pad#8 => pad#10
data link link#14: pad#13 => pad#11
data link link#15: pad#13 => pad#11
data link link#16: pad#12 => pad#14
data link link#17: pad#12 => pad#14
data link link#18: pad#17 => pad#15
data link link#19: pad#17 => pad#15
data link link#20: pad#16 => pad#18
data link link#21: pad#16 => pad#18
data link link#22: pad#5 => pad#7
data link link#23: pad#5 => pad#7
data link link#24: pad#2 => pad#7
data link link#25: pad#2 => pad#7
data link link#26: pad#9 => pad#11
data link link#27: pad#9 => pad#11
data link link#28: pad#8 => pad#15
data link link#29: pad#8 => pad#15
data link link#30: pad#12 => pad#15
data link link#31: pad#12 => pad#15
data link link#32: pad#9 => pad#19 [IMMUTABLE] [ENABLED]
data link link#33: pad#9 => pad#19 [IMMUTABLE] [ENABLED]
data link link#34: pad#9 => pad#20 [IMMUTABLE] [ENABLED]
data link link#35: pad#9 => pad#20 [IMMUTABLE] [ENABLED]
data link link#36: pad#9 => pad#21 [IMMUTABLE] [ENABLED]
data link link#37: pad#9 => pad#21 [IMMUTABLE] [ENABLED]
Everything is working as it should.
So:
Tested-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> ---
>
> drivers/media/platform/omap3isp/isp.c | 152 +++++++++++++++++----------
> drivers/media/platform/omap3isp/ispccdc.c | 22 ++--
> drivers/media/platform/omap3isp/ispccdc.h | 1 +
> drivers/media/platform/omap3isp/ispccp2.c | 22 ++--
> drivers/media/platform/omap3isp/ispccp2.h | 1 +
> drivers/media/platform/omap3isp/ispcsi2.c | 22 ++--
> drivers/media/platform/omap3isp/ispcsi2.h | 1 +
> drivers/media/platform/omap3isp/isppreview.c | 33 +++---
> drivers/media/platform/omap3isp/isppreview.h | 1 +
> drivers/media/platform/omap3isp/ispresizer.c | 33 +++---
> drivers/media/platform/omap3isp/ispresizer.h | 1 +
> 11 files changed, 185 insertions(+), 104 deletions(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index f3248b90f44d..0577d9254bed 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -1931,6 +1931,100 @@ done:
> return ret;
> }
>
> +/*
> + * isp_create_pads_links - Pads links creation for the subdevices
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +static int isp_create_pads_links(struct isp_device *isp)
> +{
> + int ret;
> +
> + ret = omap3isp_csi2_create_pads_links(isp);
> + if (ret < 0) {
> + dev_err(isp->dev, "CSI2 pads links creation failed\n");
> + return ret;
> + }
> +
> + ret = omap3isp_ccp2_create_pads_links(isp);
> + if (ret < 0) {
> + dev_err(isp->dev, "CCP2 pads links creation failed\n");
> + return ret;
> + }
> +
> + ret = omap3isp_ccdc_create_pads_links(isp);
> + if (ret < 0) {
> + dev_err(isp->dev, "CCDC pads links creation failed\n");
> + return ret;
> + }
> +
> + ret = omap3isp_preview_create_pads_links(isp);
> + if (ret < 0) {
> + dev_err(isp->dev, "Preview pads links creation failed\n");
> + return ret;
> + }
> +
> + ret = omap3isp_resizer_create_pads_links(isp);
> + if (ret < 0) {
> + dev_err(isp->dev, "Resizer pads links creation failed\n");
> + return ret;
> + }
> +
> + /* Connect the submodules. */
> + ret = media_create_pad_link(
> + &isp->isp_csi2a.subdev.entity, CSI2_PAD_SOURCE,
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccp2.subdev.entity, CCP2_PAD_SOURCE,
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> + &isp->isp_prev.subdev.entity, PREV_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_OF,
> + &isp->isp_res.subdev.entity, RESZ_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_prev.subdev.entity, PREV_PAD_SOURCE,
> + &isp->isp_res.subdev.entity, RESZ_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> + &isp->isp_aewb.subdev.entity, 0,
> + MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> + &isp->isp_af.subdev.entity, 0,
> + MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> + if (ret < 0)
> + return ret;
> +
> + ret = media_create_pad_link(
> + &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> + &isp->isp_hist.subdev.entity, 0,
> + MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> static void isp_cleanup_modules(struct isp_device *isp)
> {
> omap3isp_h3a_aewb_cleanup(isp);
> @@ -2001,62 +2095,8 @@ static int isp_initialize_modules(struct isp_device *isp)
> goto error_h3a_af;
> }
>
> - /* Connect the submodules. */
> - ret = media_create_pad_link(
> - &isp->isp_csi2a.subdev.entity, CSI2_PAD_SOURCE,
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccp2.subdev.entity, CCP2_PAD_SOURCE,
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> - &isp->isp_prev.subdev.entity, PREV_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_OF,
> - &isp->isp_res.subdev.entity, RESZ_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_prev.subdev.entity, PREV_PAD_SOURCE,
> - &isp->isp_res.subdev.entity, RESZ_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> - &isp->isp_aewb.subdev.entity, 0,
> - MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> - &isp->isp_af.subdev.entity, 0,
> - MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(
> - &isp->isp_ccdc.subdev.entity, CCDC_PAD_SOURCE_VP,
> - &isp->isp_hist.subdev.entity, 0,
> - MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_h3a_af_cleanup(isp);
> error_h3a_af:
> omap3isp_h3a_aewb_cleanup(isp);
> error_h3a_aewb:
> @@ -2466,6 +2506,10 @@ static int isp_probe(struct platform_device *pdev)
> if (ret < 0)
> goto error_modules;
>
> + ret = isp_create_pads_links(isp);
> + if (ret < 0)
> + goto error_register_entities;
> +
> isp->notifier.bound = isp_subdev_notifier_bound;
> isp->notifier.complete = isp_subdev_notifier_complete;
>
> diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
> index 6b5c52b7f755..f0e530c98188 100644
> --- a/drivers/media/platform/omap3isp/ispccdc.c
> +++ b/drivers/media/platform/omap3isp/ispccdc.c
> @@ -2671,16 +2671,8 @@ static int ccdc_init_entities(struct isp_ccdc_device *ccdc)
> if (ret < 0)
> goto error_video;
>
> - /* Connect the CCDC subdev to the video node. */
> - ret = media_create_pad_link(&ccdc->subdev.entity, CCDC_PAD_SOURCE_OF,
> - &ccdc->video_out.video.entity, 0, 0);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_video_cleanup(&ccdc->video_out);
> error_video:
> media_entity_cleanup(me);
> return ret;
> @@ -2726,6 +2718,20 @@ int omap3isp_ccdc_init(struct isp_device *isp)
> }
>
> /*
> + * omap3isp_ccdc_create_pads_links - CCDC pads links creation
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +int omap3isp_ccdc_create_pads_links(struct isp_device *isp)
> +{
> + struct isp_ccdc_device *ccdc = &isp->isp_ccdc;
> +
> + /* Connect the CCDC subdev to the video node. */
> + return media_create_pad_link(&ccdc->subdev.entity, CCDC_PAD_SOURCE_OF,
> + &ccdc->video_out.video.entity, 0, 0);
> +}
> +
> +/*
> * omap3isp_ccdc_cleanup - CCDC module cleanup.
> * @isp: Device pointer specific to the OMAP3 ISP.
> */
> diff --git a/drivers/media/platform/omap3isp/ispccdc.h b/drivers/media/platform/omap3isp/ispccdc.h
> index 3440a7097940..2128203ef6fb 100644
> --- a/drivers/media/platform/omap3isp/ispccdc.h
> +++ b/drivers/media/platform/omap3isp/ispccdc.h
> @@ -163,6 +163,7 @@ struct isp_ccdc_device {
> struct isp_device;
>
> int omap3isp_ccdc_init(struct isp_device *isp);
> +int omap3isp_ccdc_create_pads_links(struct isp_device *isp);
> void omap3isp_ccdc_cleanup(struct isp_device *isp);
> int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,
> struct v4l2_device *vdev);
> diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
> index 4ec96bd51094..ae3038e643cc 100644
> --- a/drivers/media/platform/omap3isp/ispccp2.c
> +++ b/drivers/media/platform/omap3isp/ispccp2.c
> @@ -1104,16 +1104,8 @@ static int ccp2_init_entities(struct isp_ccp2_device *ccp2)
> if (ret < 0)
> goto error_video;
>
> - /* Connect the video node to the ccp2 subdev. */
> - ret = media_create_pad_link(&ccp2->video_in.video.entity, 0,
> - &ccp2->subdev.entity, CCP2_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_video_cleanup(&ccp2->video_in);
> error_video:
> media_entity_cleanup(&ccp2->subdev.entity);
> return ret;
> @@ -1162,6 +1154,20 @@ int omap3isp_ccp2_init(struct isp_device *isp)
> }
>
> /*
> + * omap3isp_ccp2_create_pads_links - CCP2 pads links creation
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +int omap3isp_ccp2_create_pads_links(struct isp_device *isp)
> +{
> + struct isp_ccp2_device *ccp2 = &isp->isp_ccp2;
> +
> + /* Connect the video node to the ccp2 subdev. */
> + return media_create_pad_link(&ccp2->video_in.video.entity, 0,
> + &ccp2->subdev.entity, CCP2_PAD_SINK, 0);
> +}
> +
> +/*
> * omap3isp_ccp2_cleanup - CCP2 un-initialization
> * @isp : Pointer to ISP device
> */
> diff --git a/drivers/media/platform/omap3isp/ispccp2.h b/drivers/media/platform/omap3isp/ispccp2.h
> index 4662bffa79e3..fb74bc67878b 100644
> --- a/drivers/media/platform/omap3isp/ispccp2.h
> +++ b/drivers/media/platform/omap3isp/ispccp2.h
> @@ -79,6 +79,7 @@ struct isp_ccp2_device {
>
> /* Function declarations */
> int omap3isp_ccp2_init(struct isp_device *isp);
> +int omap3isp_ccp2_create_pads_links(struct isp_device *isp);
> void omap3isp_ccp2_cleanup(struct isp_device *isp);
> int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,
> struct v4l2_device *vdev);
> diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c
> index 054e25e1f2ec..b1617f7efdee 100644
> --- a/drivers/media/platform/omap3isp/ispcsi2.c
> +++ b/drivers/media/platform/omap3isp/ispcsi2.c
> @@ -1269,16 +1269,8 @@ static int csi2_init_entities(struct isp_csi2_device *csi2)
> if (ret < 0)
> goto error_video;
>
> - /* Connect the CSI2 subdev to the video node. */
> - ret = media_create_pad_link(&csi2->subdev.entity, CSI2_PAD_SOURCE,
> - &csi2->video_out.video.entity, 0, 0);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_video_cleanup(&csi2->video_out);
> error_video:
> media_entity_cleanup(&csi2->subdev.entity);
> return ret;
> @@ -1319,6 +1311,20 @@ int omap3isp_csi2_init(struct isp_device *isp)
> }
>
> /*
> + * omap3isp_csi2_create_pads_links - CSI2 pads links creation
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +int omap3isp_csi2_create_pads_links(struct isp_device *isp)
> +{
> + struct isp_csi2_device *csi2a = &isp->isp_csi2a;
> +
> + /* Connect the CSI2 subdev to the video node. */
> + return media_create_pad_link(&csi2a->subdev.entity, CSI2_PAD_SOURCE,
> + &csi2a->video_out.video.entity, 0, 0);
> +}
> +
> +/*
> * omap3isp_csi2_cleanup - Routine for module driver cleanup
> */
> void omap3isp_csi2_cleanup(struct isp_device *isp)
> diff --git a/drivers/media/platform/omap3isp/ispcsi2.h b/drivers/media/platform/omap3isp/ispcsi2.h
> index 453ed62fe394..452ee239c7d7 100644
> --- a/drivers/media/platform/omap3isp/ispcsi2.h
> +++ b/drivers/media/platform/omap3isp/ispcsi2.h
> @@ -148,6 +148,7 @@ struct isp_csi2_device {
> void omap3isp_csi2_isr(struct isp_csi2_device *csi2);
> int omap3isp_csi2_reset(struct isp_csi2_device *csi2);
> int omap3isp_csi2_init(struct isp_device *isp);
> +int omap3isp_csi2_create_pads_links(struct isp_device *isp);
> void omap3isp_csi2_cleanup(struct isp_device *isp);
> void omap3isp_csi2_unregister_entities(struct isp_csi2_device *csi2);
> int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,
> diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
> index 4e16feb0e929..cfb2debb02bf 100644
> --- a/drivers/media/platform/omap3isp/isppreview.c
> +++ b/drivers/media/platform/omap3isp/isppreview.c
> @@ -2316,21 +2316,8 @@ static int preview_init_entities(struct isp_prev_device *prev)
> if (ret < 0)
> goto error_video_out;
>
> - /* Connect the video nodes to the previewer subdev. */
> - ret = media_create_pad_link(&prev->video_in.video.entity, 0,
> - &prev->subdev.entity, PREV_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(&prev->subdev.entity, PREV_PAD_SOURCE,
> - &prev->video_out.video.entity, 0, 0);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_video_cleanup(&prev->video_out);
> error_video_out:
> omap3isp_video_cleanup(&prev->video_in);
> error_video_in:
> @@ -2354,6 +2341,26 @@ int omap3isp_preview_init(struct isp_device *isp)
> return preview_init_entities(prev);
> }
>
> +/*
> + * omap3isp_preview_create_pads_links - Previewer pads links creation
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +int omap3isp_preview_create_pads_links(struct isp_device *isp)
> +{
> + struct isp_prev_device *prev = &isp->isp_prev;
> + int ret;
> +
> + /* Connect the video nodes to the previewer subdev. */
> + ret = media_create_pad_link(&prev->video_in.video.entity, 0,
> + &prev->subdev.entity, PREV_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + return media_create_pad_link(&prev->subdev.entity, PREV_PAD_SOURCE,
> + &prev->video_out.video.entity, 0, 0);
> +}
> +
> void omap3isp_preview_cleanup(struct isp_device *isp)
> {
> struct isp_prev_device *prev = &isp->isp_prev;
> diff --git a/drivers/media/platform/omap3isp/isppreview.h b/drivers/media/platform/omap3isp/isppreview.h
> index 16fdc03a3d43..f3593b7cecc7 100644
> --- a/drivers/media/platform/omap3isp/isppreview.h
> +++ b/drivers/media/platform/omap3isp/isppreview.h
> @@ -148,6 +148,7 @@ struct isp_prev_device {
> struct isp_device;
>
> int omap3isp_preview_init(struct isp_device *isp);
> +int omap3isp_preview_create_pads_links(struct isp_device *isp);
> void omap3isp_preview_cleanup(struct isp_device *isp);
>
> int omap3isp_preview_register_entities(struct isp_prev_device *prv,
> diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c
> index a05975d90153..e3ecf1787fc4 100644
> --- a/drivers/media/platform/omap3isp/ispresizer.c
> +++ b/drivers/media/platform/omap3isp/ispresizer.c
> @@ -1760,21 +1760,8 @@ static int resizer_init_entities(struct isp_res_device *res)
>
> res->video_out.video.entity.flags |= MEDIA_ENT_FL_DEFAULT;
>
> - /* Connect the video nodes to the resizer subdev. */
> - ret = media_create_pad_link(&res->video_in.video.entity, 0,
> - &res->subdev.entity, RESZ_PAD_SINK, 0);
> - if (ret < 0)
> - goto error_link;
> -
> - ret = media_create_pad_link(&res->subdev.entity, RESZ_PAD_SOURCE,
> - &res->video_out.video.entity, 0, 0);
> - if (ret < 0)
> - goto error_link;
> -
> return 0;
>
> -error_link:
> - omap3isp_video_cleanup(&res->video_out);
> error_video_out:
> omap3isp_video_cleanup(&res->video_in);
> error_video_in:
> @@ -1798,6 +1785,26 @@ int omap3isp_resizer_init(struct isp_device *isp)
> return resizer_init_entities(res);
> }
>
> +/*
> + * omap3isp_resizer_create_pads_links - Resizer pads links creation
> + * @isp : Pointer to ISP device
> + * return negative error code or zero on success
> + */
> +int omap3isp_resizer_create_pads_links(struct isp_device *isp)
> +{
> + struct isp_res_device *res = &isp->isp_res;
> + int ret;
> +
> + /* Connect the video nodes to the resizer subdev. */
> + ret = media_create_pad_link(&res->video_in.video.entity, 0,
> + &res->subdev.entity, RESZ_PAD_SINK, 0);
> + if (ret < 0)
> + return ret;
> +
> + return media_create_pad_link(&res->subdev.entity, RESZ_PAD_SOURCE,
> + &res->video_out.video.entity, 0, 0);
> +}
> +
> void omap3isp_resizer_cleanup(struct isp_device *isp)
> {
> struct isp_res_device *res = &isp->isp_res;
> diff --git a/drivers/media/platform/omap3isp/ispresizer.h b/drivers/media/platform/omap3isp/ispresizer.h
> index 5414542912e2..8b9fdcdab73d 100644
> --- a/drivers/media/platform/omap3isp/ispresizer.h
> +++ b/drivers/media/platform/omap3isp/ispresizer.h
> @@ -119,6 +119,7 @@ struct isp_res_device {
> struct isp_device;
>
> int omap3isp_resizer_init(struct isp_device *isp);
> +int omap3isp_resizer_create_pads_links(struct isp_device *isp);
> void omap3isp_resizer_cleanup(struct isp_device *isp);
>
> int omap3isp_resizer_register_entities(struct isp_res_device *res,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/