Hi Mauro,
On Friday 21 August 2015 05:42:29 Mauro Carvalho Chehab wrote:
> Em Fri, 21 Aug 2015 03:40:48 +0300 Laurent Pinchart escreveu:
> > On Wednesday 19 August 2015 08:01:48 Mauro Carvalho Chehab wrote:
> > > Instead of accessing directly entity.id, let's create a macro,
> > > as this field will be moved into a common struct later on.
> > >
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> > > Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
[snip]
> > > diff --git a/drivers/media/platform/vsp1/vsp1_video.c
> > > b/drivers/media/platform/vsp1/vsp1_video.c index
> > > 17f08973f835..debe4e539df6
> > > 100644
> > > --- a/drivers/media/platform/vsp1/vsp1_video.c
> > > +++ b/drivers/media/platform/vsp1/vsp1_video.c
> > > @@ -352,10 +352,10 @@ static int vsp1_pipeline_validate_branch(struct
> > > vsp1_pipeline *pipe,
> > > break;
> > >
> > > /* Ensure the branch has no loop. */
> > > - if (entities & (1 << entity->subdev.entity.id))
> > > + if (entities & (1 << media_entity_id(&entity->subdev.entity)))
> > > return -EPIPE;
> > >
> > > - entities |= 1 << entity->subdev.entity.id;
> > > + entities |= 1 << media_entity_id(&entity->subdev.entity);
> > >
> > > /* UDS can't be chained. */
> > > if (entity->type == VSP1_ENTITY_UDS) {
> >
> > I would move the modification of the vsp1 driver to Javier's patch that
> > modifies the OMAP3 and OMAP4 drivers. Alternatively you could squash them
> > into this patch, but I believe having a first patch that adds the inline
> > function and a second patch that modifies all drivers to use it would be
> > better.
>
> Squashing will lose Javier's authorship. I guess the better is have a
> first patch with the inline, then my paches and Javier's ones, and
> latter on the patch removing entity->id.
What I meant is
1. This patch without the VSP1 chunk, with your authorship
2. Javier's patches for OMAP3 and OMAP4 + the VSP1 chunk squashed in a single
patch, with Javier's authorship
3. Javier's patch removing entity->id, with Javier's authorship
I don't see a need to split usage of media_entity_id() into per-driver
patches.
> I'll do that on the next patch series.
>
> > > diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> > > index 8b21a4d920d9..0a66fc225559 100644
> > > --- a/include/media/media-entity.h
> > > +++ b/include/media/media-entity.h
> > > @@ -113,6 +113,11 @@ static inline u32 media_entity_subtype(struct
> > > media_entity *entity) return entity->type & MEDIA_ENT_SUBTYPE_MASK;
> > >
> > > }
> > >
> > > +static inline u32 media_entity_id(struct media_entity *entity)
> > > +{
> > > + return entity->id;
> > > +}
> > > +
> > >
> > > #define MEDIA_ENTITY_ENUM_MAX_DEPTH 16
> > > #define MEDIA_ENTITY_ENUM_MAX_ID 64
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
