| Message ID | 20190702154752.14939-6-andrealmeid@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: vimc: Add a V4L2 output device | expand |
On 7/2/19 12:47 PM, André Almeida wrote: > Add the output video device on the hardcoded pipeline. Change the link > to it be enabled by default. > > Signed-off-by: André Almeida <andrealmeid@collabora.com> > --- > drivers/media/platform/vimc/vimc-core.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c > index 571c55aa0e16..ecdea1d631c5 100644 > --- a/drivers/media/platform/vimc/vimc-core.c > +++ b/drivers/media/platform/vimc/vimc-core.c > @@ -95,8 +95,7 @@ static const struct vimc_ent_config ent_config[] = { > }, > { > .name = "RGB/YUV Input", Could you also change the name here to Output? I think it makes more sense. Helen > - /* TODO: change this to vimc-input when it is implemented */ > - .drv = "vimc-sensor", > + .drv = "vimc-output", > }, > { > .name = "Scaler", > @@ -118,11 +117,11 @@ static const struct vimc_ent_link ent_links[] = { > /* Link: Sensor B (Pad 0)->(Pad 0) Raw Capture 1 */ > VIMC_ENT_LINK(1, 0, 5, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), > /* Link: Debayer A (Pad 1)->(Pad 0) Scaler */ > - VIMC_ENT_LINK(2, 1, 7, 0, MEDIA_LNK_FL_ENABLED), > + VIMC_ENT_LINK(2, 1, 7, 0, 0), > /* Link: Debayer B (Pad 1)->(Pad 0) Scaler */ > VIMC_ENT_LINK(3, 1, 7, 0, 0), > /* Link: RGB/YUV Input (Pad 0)->(Pad 0) Scaler */ > - VIMC_ENT_LINK(6, 0, 7, 0, 0), > + VIMC_ENT_LINK(6, 0, 7, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), > /* Link: Scaler (Pad 1)->(Pad 0) RGB/YUV Capture */ > VIMC_ENT_LINK(7, 1, 8, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), > }; >
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c index 571c55aa0e16..ecdea1d631c5 100644 --- a/drivers/media/platform/vimc/vimc-core.c +++ b/drivers/media/platform/vimc/vimc-core.c @@ -95,8 +95,7 @@ static const struct vimc_ent_config ent_config[] = { }, { .name = "RGB/YUV Input", - /* TODO: change this to vimc-input when it is implemented */ - .drv = "vimc-sensor", + .drv = "vimc-output", }, { .name = "Scaler", @@ -118,11 +117,11 @@ static const struct vimc_ent_link ent_links[] = { /* Link: Sensor B (Pad 0)->(Pad 0) Raw Capture 1 */ VIMC_ENT_LINK(1, 0, 5, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), /* Link: Debayer A (Pad 1)->(Pad 0) Scaler */ - VIMC_ENT_LINK(2, 1, 7, 0, MEDIA_LNK_FL_ENABLED), + VIMC_ENT_LINK(2, 1, 7, 0, 0), /* Link: Debayer B (Pad 1)->(Pad 0) Scaler */ VIMC_ENT_LINK(3, 1, 7, 0, 0), /* Link: RGB/YUV Input (Pad 0)->(Pad 0) Scaler */ - VIMC_ENT_LINK(6, 0, 7, 0, 0), + VIMC_ENT_LINK(6, 0, 7, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), /* Link: Scaler (Pad 1)->(Pad 0) RGB/YUV Capture */ VIMC_ENT_LINK(7, 1, 8, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), };
Add the output video device on the hardcoded pipeline. Change the link to it be enabled by default. Signed-off-by: André Almeida <andrealmeid@collabora.com> --- drivers/media/platform/vimc/vimc-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)