From patchwork Fri Aug 28 06:25:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 9413 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 86020BF019 for ; Fri, 28 Aug 2020 08:26:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D327A6291C; Fri, 28 Aug 2020 10:26:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="eDzGdQOY"; dkim-atps=neutral Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9CDD06037D for ; Fri, 28 Aug 2020 08:27:12 +0200 (CEST) Received: by mail-wr1-x444.google.com with SMTP id k15so179979wrn.10 for ; Thu, 27 Aug 2020 23:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ivACTbkXKN/xMjT4G5kzszSOg4qybyUXUQfxFzyT3Gg=; b=eDzGdQOYkjsKWkP6Zui6JF5N0EJtEJue9ksZw9Jf5b8H508zFF4oWmEKeL3YX7+RW8 fdxywqdIQRWRemkmUA4axa65bdnZ9VvDPC7VL6+fCdBEnUyfKnkL4/5k3xHc/CrPCk/r xRnXj+MRi/bDSVQmhFUVpX3n/kaoCi2JMSSdeBlH3eCCUL+pT3x2DeH8vcFemZL5x83b 3P+mrSwxDZlVyUg/Sec1rO9ngRwrJzUua9+O7m3K04FV2GaR25ngADR3brebC64huVLZ pefIN8mOBV+dvqQ9CX8qMvScfVmRoPjc4TtuuCoSHKmzqVJdh8BMEKJHf2QvLDQ4yuOW jXZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ivACTbkXKN/xMjT4G5kzszSOg4qybyUXUQfxFzyT3Gg=; b=E7VHkLyu3MvYOdRuIplgOhhV2EqPOxpz/c3JrcxXaTbCe9zEyMBzLCyVRZi367DF5d fPJwuhtV6niuxM87Rg3WL+IRDC9NGa36iAis+ALvK92q4TkcC8/VEQffVfl7vTdQuBq/ wGSK9/M78p8cXnRxNGwSl+tKiho1i3A2WzkbhlSb/eYAIUFaeNwsYoRk+cTWt8XsGJyj hQ0s4KOYwhksA8RripzGpywVZaJXbTmUpDPPW0XrnJTEd0fn7y94gdw4wCmzyFfctjmo wvG6xJ6FoFaxEUweI+IQ6g9KNzQYc52oYe+uiAITrUWy3pJfSKBByZawprmSTUPHNU3h Q91Q== X-Gm-Message-State: AOAM530fLrzEzDG1Dr8J+ypvtLPGqpFt2Z/KAZSO9EHid0rxfUTtOort 8SRXnBTyT4P8Blga5U8Pt+dOcIDYIqi0sA== X-Google-Smtp-Source: ABdhPJxkeCNLameH01r7F63ZZCrgDNxrhqwpUSqSaYO7hhUHuVAFCALhIgsmreBFVn6ZasCN71JayQ== X-Received: by 2002:adf:ef45:: with SMTP id c5mr1440711wrp.37.1598596032087; Thu, 27 Aug 2020 23:27:12 -0700 (PDT) Received: from valhalla.home ([2.29.208.34]) by smtp.gmail.com with ESMTPSA id h7sm406594wmf.43.2020.08.27.23.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 23:27:11 -0700 (PDT) From: Dan Scally X-Google-Original-From: Dan Scally To: libcamera-devel@lists.libcamera.org Date: Fri, 28 Aug 2020 07:25:20 +0100 Message-Id: <20200828062520.1110800-1-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 28 Aug 2020 10:26:22 +0200 Subject: [libcamera-devel] [PATCH v3] MediaLink: Make MediaLink::setEnabled account for existing X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The setupLink function fails (ioctl returns EINVAL) when it passes the MEDIA_LNK_FL_ENABLE flag to a link that is already flagged with MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to media-ctl's equivalent media_setup_link() which ORs the new flags with the existing values. This patch modifies the behaviour of setupLink() to behave the same as media_setup_link() in media-ctl. Signed-off-by: Dan Scally Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- Changelog: v3 - Moved the change to MediaLink::setEnabled() v2 - Simplified by removing the call to link() to fetch a link that's already passed as a parameter to the function. src/libcamera/media_object.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index ce77a72..a2e6a0d 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -115,7 +115,8 @@ LOG_DECLARE_CATEGORY(MediaDevice) */ int MediaLink::setEnabled(bool enable) { - unsigned int flags = enable ? MEDIA_LNK_FL_ENABLED : 0; + unsigned int flags = (flags_ & ~MEDIA_LNK_FL_ENABLED) + | (enable ? MEDIA_LNK_FL_ENABLED : 0); int ret = dev_->setupLink(this, flags); if (ret)