{"id":9375,"url":"https://patchwork.libcamera.org/api/1.1/patches/9375/?format=json","web_url":"https://patchwork.libcamera.org/patch/9375/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<2fi0-eM0Z4VDp7ia9hJVx96VwN0n3oGU3Jv05Af9xKBJ5mGjXNJ5KV7SRbExyTImQblR8jBiGAtJnPhtuMVzDqrLBkYd_KQ2q77ScInUiSM=@protonmail.com>","date":"2020-08-24T20:01:59","name":"[libcamera-devel] src/libcamera/media_device.cpp: Make MediaDevice::setupLink account for existing link flags","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"055fac02813563292ac08d4b30a12b29df888650","submitter":{"id":66,"url":"https://patchwork.libcamera.org/api/1.1/people/66/?format=json","name":"Dan Scally","email":"djrscally@protonmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9375/mbox/","series":[{"id":1239,"url":"https://patchwork.libcamera.org/api/1.1/series/1239/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1239","date":"2020-08-24T20:01:59","name":"[libcamera-devel] src/libcamera/media_device.cpp: Make MediaDevice::setupLink account for existing link flags","version":1,"mbox":"https://patchwork.libcamera.org/series/1239/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9375/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9375/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id D214ABE173\n\tfor ;\n\tMon, 24 Aug 2020 20:02:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5FF576170D;\n\tMon, 24 Aug 2020 22:02:04 +0200 (CEST)","from mail4.protonmail.ch (mail4.protonmail.ch [185.70.40.27])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 703F5616B1\n\tfor ;\n\tMon, 24 Aug 2020 22:02:02 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=protonmail.com header.i=@protonmail.com\n\theader.b=\"tnH5K1f3\"; dkim-atps=neutral","Date":"Mon, 24 Aug 2020 20:01:59 +0000","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;\n\ts=protonmail; t=1598299321;\n\tbh=0h6Se78leWrMQeT6/dsgCSkpT/CITFXSoSXHcJ2jCdo=;\n\th=Date:To:From:Reply-To:Subject:From;\n\tb=tnH5K1f3t60cWS+HeGRdrb80ItJ23WuXK7INOdYHwebg1HTKIb6jPjEn3M+8Ql3wX\n\tlw/6L27VwXkTvdCsZRB93M01w4SXG8RcP/6AvEtV0CD9Ifsq3iQlw2DveLbkB26OEj\n\tk16LEqCa3z1ekYglohUhUK+uoaMhT3b1V0GAkQhs=","To":"\"libcamera-devel@lists.libcamera.org\"\n\t","From":"Dan Scally ","Message-ID":"<2fi0-eM0Z4VDp7ia9hJVx96VwN0n3oGU3Jv05Af9xKBJ5mGjXNJ5KV7SRbExyTImQblR8jBiGAtJnPhtuMVzDqrLBkYd_KQ2q77ScInUiSM=@protonmail.com>","MIME-Version":"1.0","X-Spam-Status":"No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,\n\tDKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF,\n\tFREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4","X-Spam-Checker-Version":"SpamAssassin 3.4.4 (2020-01-24) on\n\tmailout.protonmail.ch","Subject":"[libcamera-devel] [PATCH] src/libcamera/media_device.cpp: Make\n\tMediaDevice::setupLink account for existing link flags","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"Dan Scally ","Content-Type":"multipart/mixed;\n\tboundary=\"===============1574904549429085891==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The setupLink function fails (ioctl returns EINVAL) when it passes the MEDIA_LNK_FL_ENABLE flag\nto a link that is already flagged with MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast\nto media-ctl's equivalent media_setup_link() which ORs the new flags with the existing values.\nThis patch modifies the behaviour of setupLink() to behave the same as media_setup_link() in\nmedia-ctl.\n\nref https://git.linuxtv.org/v4l-utils.git/tree/utils/media-ctl/libmediactl.c#n210\n\nSigned-off-by: Daniel Scally \n---\n src/libcamera/media_device.cpp | 17 +++++++++++++----\n 1 file changed, 13 insertions(+), 4 deletions(-)\n\n \tlinkDesc.source.index = source->index();\n@@ -794,7 +803,7 @@ int MediaDevice::setupLink(const MediaLink *link, unsigned int flags)\n \tlinkDesc.sink.index = sink->index();\n \tlinkDesc.sink.flags = MEDIA_PAD_FL_SINK;\n \n\n-\tlinkDesc.flags = flags;\n+\tlinkDesc.flags = flags | (elink->flags() & MEDIA_LNK_FL_IMMUTABLE);\n \n\n \tint ret = ioctl(fd_, MEDIA_IOC_SETUP_LINK, &linkDesc);\n \tif (ret) {","diff":"diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\nindex de18d57..cd44902 100644\n--- a/src/libcamera/media_device.cpp\n+++ b/src/libcamera/media_device.cpp\n@@ -780,11 +780,20 @@ void MediaDevice::fixupEntityFlags(struct media_v2_entity *entity)\n *\n * \\return 0 on success or a negative error code otherwise\n */\n-int MediaDevice::setupLink(const MediaLink *link, unsigned int flags)\n+int MediaDevice::setupLink(const MediaLink *nlink, unsigned int flags)\n {\n \tstruct media_link_desc linkDesc = {};\n-\tMediaPad *source = link->source();\n-\tMediaPad *sink = link->sink();\n+\tMediaPad *source = nlink->source();\n+\tMediaPad *sink = nlink->sink();\n+\tMediaLink *elink;\t// existing link\n+\n+\telink = link(source, sink);\n+\n+\tif (elink == NULL) {\n+\t\tLOG(MediaDevice, Error)\n+\t\t\t<< __func__ << \": Link not found\\n\";\n+\t\treturn -ENOENT;\n+\t}\n \n\n \tlinkDesc.source.entity = source->entity()->id();\n","prefixes":["libcamera-devel"]}