{"id":15054,"url":"https://patchwork.libcamera.org/api/1.1/patches/15054/?format=json","web_url":"https://patchwork.libcamera.org/patch/15054/","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":"<20211206185047.18285-1-laurent.pinchart@ideasonboard.com>","date":"2021-12-06T18:50:47","name":"[libcamera-devel] libcamera: media_device: Skip all non-data links during enumeration","commit_ref":"1c88396a54f832e717b64c6bc27d75d1e357f0c5","pull_url":null,"state":"accepted","archived":false,"hash":"bb603e401080e447695aef8bbb28308c0a284458","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15054/mbox/","series":[{"id":2820,"url":"https://patchwork.libcamera.org/api/1.1/series/2820/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2820","date":"2021-12-06T18:50:47","name":"[libcamera-devel] libcamera: media_device: Skip all non-data links during enumeration","version":1,"mbox":"https://patchwork.libcamera.org/series/2820/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15054/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15054/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 3D8B9BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  6 Dec 2021 18:51:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8274360876;\n\tMon,  6 Dec 2021 19:51:20 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2545060725\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  6 Dec 2021 19:51:19 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AF4DFEE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  6 Dec 2021 19:51:18 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"luRYv0xB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638816678;\n\tbh=ZxB/c+DMwpxlaN030e7h6LjymAGiNsO/ipdc51kqLSA=;\n\th=From:To:Subject:Date:From;\n\tb=luRYv0xBmmwFcPHHh98rqBfL1jO1w+/RalM1q+BM0Wi4sBQ7dr6Q5C53sR2Mr07k6\n\tLYbZ5XHbNDY/ENmqx/UFpYHtl8HuAkzifNQ1iivx9zo1tf1531HIWvZubsTHUydSr2\n\tnRrq7iKGL4QiCPg8asE7W/xJhZewMb3q/M8dcZm8=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Mon,  6 Dec 2021 20:50:47 +0200","Message-Id":"<20211206185047.18285-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: media_device: Skip all\n\tnon-data links during enumeration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"The MediaDevice::populateLinks() function iterates over data links by\nskipping interface links. This isn't very future-proof, it will break if\nthe kernel adds new types of links. Fix it by only considering data\nlinks instead of blacklisting interface links.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nLet's merge this ASAP to avoid bug reports when using an older libcamera\nversion with a kernel that supports the soon-to-be-added ancillary\nlinks.\n---\n src/libcamera/media_device.cpp | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)\n\n\nbase-commit: 294663eece8c067d268442724b969c9dfa081b0a","diff":"diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\nindex 4df0a27fe193..0b7940182d0c 100644\n--- a/src/libcamera/media_device.cpp\n+++ b/src/libcamera/media_device.cpp\n@@ -695,12 +695,9 @@ bool MediaDevice::populateLinks(const struct media_v2_topology &topology)\n \t\t\t\t\t   (topology.ptr_links);\n \n \tfor (unsigned int i = 0; i < topology.num_links; ++i) {\n-\t\t/*\n-\t\t * Skip links between entities and interfaces: we only care\n-\t\t * about pad-2-pad links here.\n-\t\t */\n-\t\tif ((mediaLinks[i].flags & MEDIA_LNK_FL_LINK_TYPE) ==\n-\t\t    MEDIA_LNK_FL_INTERFACE_LINK)\n+\t\t/* We only care about pad-2-pad links here. */\n+\t\tif ((mediaLinks[i].flags & MEDIA_LNK_FL_LINK_TYPE) !=\n+\t\t    MEDIA_LNK_FL_DATA_LINK)\n \t\t\tcontinue;\n \n \t\t/* Store references to source and sink pads in the link. */\n","prefixes":["libcamera-devel"]}