Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp129588ybx; Tue, 29 Oct 2019 15:32:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZHN8ozVhUjtviyKuPdqg8NuvNeGSQIV9dTWruGweUKOrgPrqwt5EDqepYZ9xLUFmyxPh5 X-Received: by 2002:a17:906:4dcf:: with SMTP id f15mr5860070ejw.193.1572388364289; Tue, 29 Oct 2019 15:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572388364; cv=none; d=google.com; s=arc-20160816; b=TdtKqVozui0bbz5FMLLWuidKe14eYTIxIsasBX5scX1xjGU8Vx8wESpr+PMbzj5hx7 qz7ulg9aXw8CqdOSwzt2U9spRl/s+3Cd1xpMGX9Oj5Ky0i/HHR3Fj8/cDv3/panxn5LG Np2KVARPFvt9QeLC/1O7J33ap1YWZFRk1JbCLl550GF78RMFnYBP68dAgIRDB5uPWfZ7 ARq41O69ehUkl7cbeSdqzVPJTxr76+qSS+PmjDVtmHarNHQfA5DtGvOlh69+AzoZOOzl 8ctVAvlNoZEPZkqi+tM++l06DzBbxiBPWaagUkhlf761tyhmzY09Z43RIe31gkaU7hCK GYBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:from:references:cc:to:subject; bh=yFJXy/SN4i4v92eB/RFEz0RJ+dEHJ9kTdF9pMS5BxEw=; b=BtFVkGTyW/lBog6X79cUynMI/4aFXKRKlMqKHz9yVdEQp6N+3BzqvYIjCofANpcu5w 1oZWj5fkBFQsT56YPYJ5J0SQK6MPe/P6mlsqAThCrZsWxDGpIQObmzxyST389mZ0l1QI TXWfhNpMeNETV/KBFNV0pGkN7QZ/eVs57sXTyGCvQm1cArrg8vEKKV/lXzLIzAM30FGh khRPiRrbZcda4MS9Y1ICYwdzfXuiE9XfDrkDej1VuBLBZyXvQ15uczv3zHdVjbQUwBfX NCIIM47StGwbCpVpam24nhCvstuX2parr3Hh61TRUWW53AFVzHQlkuO+1N8KGDEHV5pV vwXQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h22si57117edb.346.2019.10.29.15.32.20; Tue, 29 Oct 2019 15:32:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726287AbfJ2W3G (ORCPT + 99 others); Tue, 29 Oct 2019 18:29:06 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:55440 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbfJ2W3F (ORCPT ); Tue, 29 Oct 2019 18:29:05 -0400 Received: from [IPv6:2a01:e34:ec18:2940:6552:ae8c:989f:4277] (unknown [IPv6:2a01:e34:ec18:2940:6552:ae8c:989f:4277]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 4B49728A103; Tue, 29 Oct 2019 22:29:03 +0000 (GMT) Subject: Re: [PATCH v2] media: vimc: Make capture devices and subdevices use different link_validates To: =?UTF-8?B?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , linux-media@vger.kernel.org Cc: Shuah Khan , Mauro Carvalho Chehab , Hans Verkuil , linux-kernel@vger.kernel.org, lkcamp@lists.libreplanetbr.org References: <20191009001854.2253748-1-nfraprado@protonmail.com> From: Helen Koike Openpgp: preference=signencrypt Autocrypt: addr=helen.koike@collabora.com; keydata= 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 Message-ID: Date: Tue, 29 Oct 2019 23:29:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20191009001854.2253748-1-nfraprado@protonmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Nícolas, Thanks for the patch, please see my comments below. On 10/9/19 2:19 AM, Nícolas F. R. A. Prado wrote: > Instead of validating the links to capture devices and subdevices with > the same function, use the default v4l function for links between > subdevices and only use a different function for validating between > capture device and subdevice. > This change should also ease future work to associate multiple mbus > codes for the same pixelformat in vimc_pix_map. > > These changes were tested with > v4l2-compliance SHA: 3f806630e2ecbcebe31872b865c5c4b42f111a99, 64 bits > and passed all tests: > Grand Total for vimc device /dev/media0: 451, Succeeded: 451, Failed: 0, Warnings: 0 > > Signed-off-by: Nícolas F. R. A. Prado Your patch doesn't apply anymore on top of media/master, there are some small conflicts, could you send a v3 with those solved please? > --- > Changes in v2: > - Remove blank lines > - Rename vimc_cap_link_validate to vimc_vdev_link_validate and move it back to > vimc-common.c > - Fix style issue on vimc_get_pix_format header > - Remove vimc_get_pix_format declaration from vimc-common.h > > drivers/media/platform/vimc/vimc-capture.c | 2 +- > drivers/media/platform/vimc/vimc-common.c | 86 +++++++++++----------- > drivers/media/platform/vimc/vimc-common.h | 4 +- > 3 files changed, 46 insertions(+), 46 deletions(-) > > diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c > index 602f80323031..75daebd625a8 100644 > --- a/drivers/media/platform/vimc/vimc-capture.c > +++ b/drivers/media/platform/vimc/vimc-capture.c > @@ -322,7 +322,7 @@ static const struct vb2_ops vimc_cap_qops = { > }; > > static const struct media_entity_operations vimc_cap_mops = { > - .link_validate = vimc_link_validate, > + .link_validate = vimc_vdev_link_validate, > }; > > static void vimc_cap_release(struct video_device *vdev) > diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c > index a3120f4f7a90..a67813e750d9 100644 > --- a/drivers/media/platform/vimc/vimc-common.c > +++ b/drivers/media/platform/vimc/vimc-common.c > @@ -247,35 +247,35 @@ int vimc_pipeline_s_stream(struct media_entity *ent, int enable) > } > EXPORT_SYMBOL_GPL(vimc_pipeline_s_stream); > > -static int vimc_get_mbus_format(struct media_pad *pad, > - struct v4l2_subdev_format *fmt) > +int vimc_get_pix_format(struct media_pad *pad, struct v4l2_pix_format *fmt) static int vimc_get_pix_format() > { > if (is_media_entity_v4l2_subdev(pad->entity)) { > struct v4l2_subdev *sd = > media_entity_to_v4l2_subdev(pad->entity); > + struct v4l2_subdev_format sd_fmt; > + const struct vimc_pix_map *pix_map; > int ret; > > - fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE; > - fmt->pad = pad->index; > + sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; > + sd_fmt.pad = pad->index; > > - ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt); > + ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &sd_fmt); > if (ret) > return ret; > > + v4l2_fill_pix_format(fmt, &sd_fmt.format); > + pix_map = vimc_pix_map_by_code(sd_fmt.format.code); > + fmt->pixelformat = pix_map->pixelformat; > } else if (is_media_entity_v4l2_video_device(pad->entity)) { > struct video_device *vdev = container_of(pad->entity, > struct video_device, > entity); > struct vimc_ent_device *ved = video_get_drvdata(vdev); > - const struct vimc_pix_map *vpix; > - struct v4l2_pix_format vdev_fmt; > > if (!ved->vdev_get_format) > return -ENOIOCTLCMD; > > - ved->vdev_get_format(ved, &vdev_fmt); > - vpix = vimc_pix_map_by_pixelformat(vdev_fmt.pixelformat); > - v4l2_fill_mbus_format(&fmt->format, &vdev_fmt, vpix->code); > + ved->vdev_get_format(ved, fmt); > } else { > return -EINVAL; > } > @@ -283,16 +283,16 @@ static int vimc_get_mbus_format(struct media_pad *pad, > return 0; > } > > -int vimc_link_validate(struct media_link *link) > +int vimc_vdev_link_validate(struct media_link *link) > { > - struct v4l2_subdev_format source_fmt, sink_fmt; > + struct v4l2_pix_format source_fmt, sink_fmt; > int ret; > > - ret = vimc_get_mbus_format(link->source, &source_fmt); > + ret = vimc_get_pix_format(link->source, &source_fmt); > if (ret) > return ret; > > - ret = vimc_get_mbus_format(link->sink, &sink_fmt); > + ret = vimc_get_pix_format(link->sink, &sink_fmt); > if (ret) > return ret; > > @@ -301,21 +301,21 @@ int vimc_link_validate(struct media_link *link) > "%s:snk:%dx%d (0x%x, %d, %d, %d, %d)\n", > /* src */ > link->source->entity->name, > - source_fmt.format.width, source_fmt.format.height, > - source_fmt.format.code, source_fmt.format.colorspace, > - source_fmt.format.quantization, source_fmt.format.xfer_func, > - source_fmt.format.ycbcr_enc, > + source_fmt.width, source_fmt.height, > + source_fmt.pixelformat, source_fmt.colorspace, > + source_fmt.quantization, source_fmt.xfer_func, > + source_fmt.ycbcr_enc, > /* sink */ > link->sink->entity->name, > - sink_fmt.format.width, sink_fmt.format.height, > - sink_fmt.format.code, sink_fmt.format.colorspace, > - sink_fmt.format.quantization, sink_fmt.format.xfer_func, > - sink_fmt.format.ycbcr_enc); > - > - /* The width, height and code must match. */ > - if (source_fmt.format.width != sink_fmt.format.width > - || source_fmt.format.height != sink_fmt.format.height > - || source_fmt.format.code != sink_fmt.format.code) > + sink_fmt.width, sink_fmt.height, > + sink_fmt.pixelformat, sink_fmt.colorspace, > + sink_fmt.quantization, sink_fmt.xfer_func, > + sink_fmt.ycbcr_enc); > + > + /* The width, height and pixelformat must match. */ > + if (source_fmt.width != sink_fmt.width > + || source_fmt.height != sink_fmt.height > + || source_fmt.pixelformat != sink_fmt.pixelformat) > return -EPIPE; > > /* > @@ -323,44 +323,44 @@ int vimc_link_validate(struct media_link *link) > * to support interlaced hardware connected to bridges that support > * progressive formats only. > */ > - if (source_fmt.format.field != sink_fmt.format.field && > - sink_fmt.format.field != V4L2_FIELD_NONE) > + if (source_fmt.field != sink_fmt.field && > + sink_fmt.field != V4L2_FIELD_NONE) > return -EPIPE; > > /* > * If colorspace is DEFAULT, then assume all the colorimetry is also > * DEFAULT, return 0 to skip comparing the other colorimetry parameters > */ > - if (source_fmt.format.colorspace == V4L2_COLORSPACE_DEFAULT > - || sink_fmt.format.colorspace == V4L2_COLORSPACE_DEFAULT) > + if (source_fmt.colorspace == V4L2_COLORSPACE_DEFAULT > + || sink_fmt.colorspace == V4L2_COLORSPACE_DEFAULT) > return 0; > > /* Colorspace must match. */ > - if (source_fmt.format.colorspace != sink_fmt.format.colorspace) > + if (source_fmt.colorspace != sink_fmt.colorspace) > return -EPIPE; > > /* Colorimetry must match if they are not set to DEFAULT */ > - if (source_fmt.format.ycbcr_enc != V4L2_YCBCR_ENC_DEFAULT > - && sink_fmt.format.ycbcr_enc != V4L2_YCBCR_ENC_DEFAULT > - && source_fmt.format.ycbcr_enc != sink_fmt.format.ycbcr_enc) > + if (source_fmt.ycbcr_enc != V4L2_YCBCR_ENC_DEFAULT > + && sink_fmt.ycbcr_enc != V4L2_YCBCR_ENC_DEFAULT > + && source_fmt.ycbcr_enc != sink_fmt.ycbcr_enc) > return -EPIPE; > > - if (source_fmt.format.quantization != V4L2_QUANTIZATION_DEFAULT > - && sink_fmt.format.quantization != V4L2_QUANTIZATION_DEFAULT > - && source_fmt.format.quantization != sink_fmt.format.quantization) > + if (source_fmt.quantization != V4L2_QUANTIZATION_DEFAULT > + && sink_fmt.quantization != V4L2_QUANTIZATION_DEFAULT > + && source_fmt.quantization != sink_fmt.quantization) > return -EPIPE; > > - if (source_fmt.format.xfer_func != V4L2_XFER_FUNC_DEFAULT > - && sink_fmt.format.xfer_func != V4L2_XFER_FUNC_DEFAULT > - && source_fmt.format.xfer_func != sink_fmt.format.xfer_func) > + if (source_fmt.xfer_func != V4L2_XFER_FUNC_DEFAULT > + && sink_fmt.xfer_func != V4L2_XFER_FUNC_DEFAULT > + && source_fmt.xfer_func != sink_fmt.xfer_func) > return -EPIPE; > > return 0; > } > -EXPORT_SYMBOL_GPL(vimc_link_validate); > +EXPORT_SYMBOL_GPL(vimc_vdev_link_validate); This is not required anymore as Vimc is a monolithic driver now, these EXPORTs macros got removed. Thanks Helen > > static const struct media_entity_operations vimc_ent_sd_mops = { > - .link_validate = vimc_link_validate, > + .link_validate = v4l2_subdev_link_validate, > }; > > int vimc_ent_sd_register(struct vimc_ent_device *ved, > diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h > index 698db7c07645..145cee076bd7 100644 > --- a/drivers/media/platform/vimc/vimc-common.h > +++ b/drivers/media/platform/vimc/vimc-common.h > @@ -264,12 +264,12 @@ void vimc_ent_sd_unregister(struct vimc_ent_device *ved, > struct v4l2_subdev *sd); > > /** > - * vimc_link_validate - validates a media link > + * vimc_vdev_link_validate - validates a media link > * > * @link: pointer to &struct media_link > * > * This function calls validates if a media link is valid for streaming. > */ > -int vimc_link_validate(struct media_link *link); > +int vimc_vdev_link_validate(struct media_link *link); > > #endif >