From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lists.s-osg.org ([54.187.51.154]:59175 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbbHUUqJ (ORCPT ); Fri, 21 Aug 2015 16:46:09 -0400 Date: Fri, 21 Aug 2015 17:46:04 -0300 From: Mauro Carvalho Chehab To: Laurent Pinchart Cc: Linux Media Mailing List , Mauro Carvalho Chehab , linux-sh@vger.kernel.org Subject: Re: [PATCH v6 1/8] [media] media: create a macro to get entity ID Message-ID: <20150821174604.3b0d64d3@recife.lan> In-Reply-To: <7241853.lyNlEo06u5@avalon> References: <1504949.EhTF6JoeCK@avalon> <20150821144535.0f75cc92@recife.lan> <7241853.lyNlEo06u5@avalon> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em Fri, 21 Aug 2015 21:11:57 +0300 Laurent Pinchart escreveu: > Hi Mauro, > > On Friday 21 August 2015 14:45:35 Mauro Carvalho Chehab wrote: > > Em Fri, 21 Aug 2015 20:27:19 +0300 Laurent Pinchart escreveu: > > > 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 > > >>>> Acked-by: Hans Verkuil > > >>>> Signed-off-by: Mauro Carvalho Chehab > > > > > > [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->subdevntity))) > > >>>> 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 > > > > Actually, the removal of entity->id is at the first patch, with my > > authorship, but I got the idea ;) > > I'm not sure to follow you. The first patch is this one, and it doesn't remove > the id field from struct media_entity. Sorry, I meant to say "the first patch series I submitted after the workshop", e. .g RFC v1. > > Btw, this was noticed because Javier is testing the MC new gen on OMAP3. > > We should really enforce that all all drivers should compile with > > COMPILE_TEST, as otherwise we'll keep having troubles like that. > > I agree with that. I've just sent a patch to enable compilation of the > omap3isp driver with COMPILE_TEST. There's still a compile-time dependency on > ARM, as well as a dependency on OMAP_IOMMU which currently depends on OMAP, > but that can be fixed independently. See the comments for the patch. Regards, Mauro