Patch Detail
Show a patch.
GET /api/1.1/patches/14407/?format=api
{ "id": 14407, "url": "https://patchwork.libcamera.org/api/1.1/patches/14407/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14407/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211028154807.36128-1-ecurtin@redhat.com>", "date": "2021-10-28T15:48:07", "name": "[libcamera-devel] cam: Add option to list displays", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0e4bef6081f3aef5f4aa46efa37c6b6ffb34e838", "submitter": { "id": 101, "url": "https://patchwork.libcamera.org/api/1.1/people/101/?format=api", "name": "Eric Curtin", "email": "ecurtin@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14407/mbox/", "series": [ { "id": 2676, "url": "https://patchwork.libcamera.org/api/1.1/series/2676/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2676", "date": "2021-10-28T15:48:07", "name": "[libcamera-devel] cam: Add option to list displays", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2676/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14407/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14407/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 7048CBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 28 Oct 2021 15:48:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A234600B6;\n\tThu, 28 Oct 2021 17:48:16 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [216.205.24.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5F163600B5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Oct 2021 17:48:14 +0200 (CEST)", "from mail-wr1-f70.google.com (mail-wr1-f70.google.com\n\t[209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id\n\tus-mta-403-F0g7So9qO5S7LuQ7PMb_HA-1; Thu, 28 Oct 2021 11:48:11 -0400", "by mail-wr1-f70.google.com with SMTP id\n\tf18-20020a5d58f2000000b001645b92c65bso2281070wrd.6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Oct 2021 08:48:11 -0700 (PDT)", "from curtine-ThinkPad-P1-Gen-3.Home\n\t([2001:8a0:6724:4500:dc68:d331:1862:9fcb])\n\tby smtp.gmail.com with ESMTPSA id\n\ts8sm3430627wrr.15.2021.10.28.08.48.09\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 28 Oct 2021 08:48:09 -0700 (PDT)" ], "Authentication-Results": [ "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"YPHNgPfm\"; dkim-atps=neutral", "relay.mimecast.com;\n\tauth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ecurtin@redhat.com" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1635436093;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding;\n\tbh=1VRE4ckrQAjRirLPtz0BnD0NnvOFwFFMyCmcYcFYtwU=;\n\tb=YPHNgPfmx0kPJQ5JNpJj8wEo93CmHasQJRxopyRxezs87OileRPDv8XlM/guw43Q31ZkSB\n\tPZAZ8AKM0+9CcGetvL+Ftzys/UHDdAoIRn8i2D2RYDYiFZmawh03d4OZyk1jyqIF2tl68A\n\tKRuUR4+mfjGF0c6tFCrhHI7CTCjxQus=", "X-MC-Unique": "F0g7So9qO5S7LuQ7PMb_HA-1", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=1VRE4ckrQAjRirLPtz0BnD0NnvOFwFFMyCmcYcFYtwU=;\n\tb=Xy/dMbUtEr4llTyrd0NnUS+RQBAPM2EDoTMIUVlVW9vhZYWqj74tOe8jh5FE6E7UGF\n\tMJxkUEsGTdJPKf/kSnfJQ6eCik0dXkRkhzFNNZrkBrP4lV57JUzh98A3YdVBOABZfPzc\n\tw9QGOB+0FAN2FzQzNH7vOd8/ec6i+HqbuBmsxxejUsTCYErLspCNLKCYdTRLUAbwjrPX\n\tYPaBDgB0uJvv1Umznd2xC8/ZVRo8IJi4e+JZCtYdkuJkkW3waeV5CDNWyRIg1vh116M6\n\ta5/UzQBXo2Yw7D/VUfOfMkDXILpiLCPd+JYoJHKi9ChFrZd1NYVFq1DD687SMUdKBr1a\n\t2/Ig==", "X-Gm-Message-State": "AOAM530xeoENmpLWwuXS+QfByHShSXpTxwvPZSd6A9TFpnylWsoNJl2A\n\tjoghaj2ip8RUhp79U2LNn7vvqbVNJtZcq9yq7+5zRMC7gMIcsVt3Auq//uU7Rn4VsZxMrdernWC\n\tOLeQnG8rBzmIavkfAN4lZA9Pl6s5Rej0LwY6uDue9BmpvUueFBKY3R9Ug1A1p26nve6Xsst7Kno\n\t4zDpYAnlDT", "X-Received": [ "by 2002:adf:f209:: with SMTP id p9mr4138035wro.191.1635436090431;\n\tThu, 28 Oct 2021 08:48:10 -0700 (PDT)", "by 2002:adf:f209:: with SMTP id p9mr4138000wro.191.1635436090150;\n\tThu, 28 Oct 2021 08:48:10 -0700 (PDT)" ], "X-Google-Smtp-Source": "ABdhPJz4bPeQ8sfmCSjUvLiKcKXZz/76kvVe4RHex/VHfYNa7zYon2nhjQ4z8ruSmqXoJIWW3ek09w==", "From": "Eric Curtin <ecurtin@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 28 Oct 2021 16:48:07 +0100", "Message-Id": "<20211028154807.36128-1-ecurtin@redhat.com>", "X-Mailer": "git-send-email 2.31.1", "MIME-Version": "1.0", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[libcamera-devel] [PATCH] cam: Add option to list displays", "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": "So the user does not have to be familiar with internals of\n/sys/class/drm/. \"xrand --query\" names aren't consistent with DRM\nnames and depend on an X server running.\n\nThis --list-displays option will show the names of the available\ndisplays and whether each display's status is connected, disconnected\nor unknown.\n\nSigned-off-by: Eric Curtin <ecurtin@redhat.com>\n---\n src/cam/drm.cpp | 3 +++\n src/cam/drm.h | 2 ++\n src/cam/main.cpp | 28 +++++++++++++++++++++++-----\n src/cam/main.h | 3 +++\n 4 files changed, 31 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/cam/drm.cpp b/src/cam/drm.cpp\nindex f2530091..444d639d 100644\n--- a/src/cam/drm.cpp\n+++ b/src/cam/drm.cpp\n@@ -190,15 +190,18 @@ Connector::Connector(Device *dev, const drmModeConnector *connector)\n \tswitch (connector->connection) {\n \tcase DRM_MODE_CONNECTED:\n \t\tstatus_ = Status::Connected;\n+\t\tstatus_str_ = \"connected\";\n \t\tbreak;\n \n \tcase DRM_MODE_DISCONNECTED:\n \t\tstatus_ = Status::Disconnected;\n+\t\tstatus_str_ = \"disconnected\";\n \t\tbreak;\n \n \tcase DRM_MODE_UNKNOWNCONNECTION:\n \tdefault:\n \t\tstatus_ = Status::Unknown;\n+\t\tstatus_str_ = \"unknown\";\n \t\tbreak;\n \t}\n \ndiff --git a/src/cam/drm.h b/src/cam/drm.h\nindex 0b88f9a3..92acd826 100644\n--- a/src/cam/drm.h\n+++ b/src/cam/drm.h\n@@ -187,6 +187,7 @@ public:\n \tconst std::string &name() const { return name_; }\n \n \tStatus status() const { return status_; }\n+\tconst std::string &status_str() const { return status_str_; }\n \n \tconst std::vector<const Encoder *> &encoders() const { return encoders_; }\n \tconst std::vector<Mode> &modes() const { return modes_; }\n@@ -194,6 +195,7 @@ public:\n private:\n \tuint32_t type_;\n \tstd::string name_;\n+\tstd::string status_str_;\n \tStatus status_;\n \tstd::vector<const Encoder *> encoders_;\n \tstd::vector<Mode> modes_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex c7f664b9..cd1ccf2f 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -15,6 +15,11 @@\n #include <libcamera/property_ids.h>\n \n #include \"camera_session.h\"\n+\n+#ifdef HAVE_KMS\n+#include \"drm.h\"\n+#endif\n+\n #include \"event_loop.h\"\n #include \"main.h\"\n #include \"options.h\"\n@@ -137,6 +142,7 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"Display viewfinder through DRM/KMS on specified connector\",\n \t\t\t \"display\", ArgumentOptional, \"connector\", false,\n \t\t\t OptCamera);\n+\tparser.addOption(OptListDisplays, OptionNone, \"List all displays\", \"list-displays\");\n #endif\n \tparser.addOption(OptFile, OptionString,\n \t\t\t \"Write captured frames to disk\\n\"\n@@ -202,7 +208,19 @@ int CamApp::run()\n \t\t}\n \t}\n \n-\t/* 2. Create the camera sessions. */\n+#ifdef HAVE_KMS\n+\t/* 2. List all displays. */\n+\tif (options_.isSet(OptListDisplays)) {\n+\t\tDRM::Device dev;\n+\t\tif (dev.init() >= 0) {\n+\t\t\tstd::cout << \"Available displays:\" << std::endl;\n+\t\t\tfor (const DRM::Connector &conn : dev.connectors())\n+\t\t\t\tstd::cout << \"name: \" << conn.name() << \" status: \" << conn.status_str() << std::endl;\n+\t\t}\n+\t}\n+#endif\n+\n+\t/* 3. Create the camera sessions. */\n \tstd::vector<std::unique_ptr<CameraSession>> sessions;\n \n \tif (options_.isSet(OptCamera)) {\n@@ -229,7 +247,7 @@ int CamApp::run()\n \t\t}\n \t}\n \n-\t/* 3. Print camera information. */\n+\t/* 4. Print camera information. */\n \tif (options_.isSet(OptListControls) ||\n \t options_.isSet(OptListProperties) ||\n \t options_.isSet(OptInfo)) {\n@@ -243,7 +261,7 @@ int CamApp::run()\n \t\t}\n \t}\n \n-\t/* 4. Start capture. */\n+\t/* 5. Start capture. */\n \tfor (const auto &session : sessions) {\n \t\tif (!session->options().isSet(OptCapture))\n \t\t\tcontinue;\n@@ -257,7 +275,7 @@ int CamApp::run()\n \t\tloopUsers_++;\n \t}\n \n-\t/* 5. Enable hotplug monitoring. */\n+\t/* 6. Enable hotplug monitoring. */\n \tif (options_.isSet(OptMonitor)) {\n \t\tstd::cout << \"Monitoring new hotplug and unplug events\" << std::endl;\n \t\tstd::cout << \"Press Ctrl-C to interrupt\" << std::endl;\n@@ -271,7 +289,7 @@ int CamApp::run()\n \tif (loopUsers_)\n \t\tloop_.exec();\n \n-\t/* 6. Stop capture. */\n+\t/* 7. Stop capture. */\n \tfor (const auto &session : sessions) {\n \t\tif (!session->options().isSet(OptCapture))\n \t\t\tcontinue;\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 1c2fab76..72050d27 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -21,6 +21,9 @@ enum {\n \tOptListControls = 256,\n \tOptStrictFormats = 257,\n \tOptMetadata = 258,\n+#ifdef HAVE_KMS\n+\tOptListDisplays = 259\n+#endif\n };\n \n #endif /* __CAM_MAIN_H__ */\n", "prefixes": [ "libcamera-devel" ] }