From patchwork Sun Aug 23 22:11:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11731927 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A935739 for ; Sun, 23 Aug 2020 22:12:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 135A420724 for ; Sun, 23 Aug 2020 22:12:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="buNX23KL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726711AbgHWWMi (ORCPT ); Sun, 23 Aug 2020 18:12:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726752AbgHWWMi (ORCPT ); Sun, 23 Aug 2020 18:12:38 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF630C061574 for ; Sun, 23 Aug 2020 15:12:37 -0700 (PDT) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E89F229F; Mon, 24 Aug 2020 00:12:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598220748; bh=GunbC1DjoKhdifnxIaVI9ZG/CdYzHs9OxUOpiRf2LYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=buNX23KLD40V9a3+ctSXhL1Y81cinlEaSaPGyWgMmsyYpqp4+6JZGUNTcXtCu3QDB Br31sk5tB/L8Y+8gIX4NtELzaDssIQ4HwZ4nrKiAo3B2UkcYEMflafHmvzWMl5D03D F/aVhqBNbEj3n/KHMN9rYjaSGDbSmVEOiYnUFKE8= From: Laurent Pinchart To: Tomi Valkeinen Cc: linux-renesas-soc@vger.kernel.org Subject: [kmsxx] [PATCH 1/2] card: Add support for writeback connectors Date: Mon, 24 Aug 2020 01:11:51 +0300 Message-Id: <20200823221152.31978-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200823221152.31978-1-laurent.pinchart@ideasonboard.com> References: <20200823221152.31978-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Enable enumeration of writeback connectors if both libdrm and the device support it. The new Card::has_writeback() method report if the card support writeback connectors. Existing code that expect all connectors to model an output may be confused by the sudden availability of new connectors. To handle this issue, - add a KMSXX_DISABLE_WRITEBACK_CONNECTORS environment variable to disable enumeration of writeback connectors, similarly to universal planes ; and - ignore writeback connectors where no specific connector is requested (Card::get_first_connected_connector(), ResourceManager::reserve_connector() if no connector name is specified, and applications that use all connected outputs). Signed-off-by: Laurent Pinchart --- kms++/inc/kms++/card.h | 2 ++ kms++/src/card.cpp | 13 +++++++++++++ kms++/src/connector.cpp | 1 + kms++util/CMakeLists.txt | 2 ++ kms++util/src/resourcemanager.cpp | 5 +++++ py/pykms/pykmsbase.cpp | 1 + utils/kmsblank.cpp | 5 +++++ utils/kmstest.cpp | 4 ++++ 8 files changed, 33 insertions(+) diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index 0a7eaaf81a8d..26468edbb503 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -53,6 +53,7 @@ public: bool has_universal_planes() const { return m_has_universal_planes; } bool has_dumb_buffers() const { return m_has_dumb; } bool has_kms() const; + bool has_writeback() const { return m_has_writeback; } std::vector get_connectors() const { return m_connectors; } std::vector get_encoders() const { return m_encoders; } @@ -91,6 +92,7 @@ private: bool m_has_atomic; bool m_has_universal_planes; bool m_has_dumb; + bool m_has_writeback; CardVersion m_version; }; diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 3a7ab700ed49..cbb5d50b505f 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -217,6 +217,17 @@ void Card::setup() m_has_atomic = false; #endif +#ifdef DRM_CLIENT_CAP_WRITEBACK_CONNECTORS + if (getenv("KMSXX_DISABLE_WRITEBACK_CONNECTORS") == 0) { + r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_WRITEBACK_CONNECTORS, 1); + m_has_writeback = r == 0; + } else { + m_has_writeback = false; + } +#else + m_has_writeback = false; +#endif + uint64_t has_dumb; r = drmGetCap(m_fd, DRM_CAP_DUMB_BUFFER, &has_dumb); m_has_dumb = r == 0 && has_dumb; @@ -316,6 +327,8 @@ void Card::restore_modes() Connector* Card::get_first_connected_connector() const { for(auto c : m_connectors) { + if (c->connector_type() == DRM_MODE_CONNECTOR_WRITEBACK) + continue; if (c->connected()) return c; } diff --git a/kms++/src/connector.cpp b/kms++/src/connector.cpp index a40861957c67..6f5f79f0e523 100644 --- a/kms++/src/connector.cpp +++ b/kms++/src/connector.cpp @@ -36,6 +36,7 @@ static const map connector_names = { { DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" }, { DRM_MODE_CONNECTOR_DSI, "DSI" }, { DRM_MODE_CONNECTOR_DPI, "DPI" }, + { DRM_MODE_CONNECTOR_WRITEBACK, "writeback" }, }; static const map connection_str = { diff --git a/kms++util/CMakeLists.txt b/kms++util/CMakeLists.txt index 0bfb56b0d58f..362824ad13d5 100644 --- a/kms++util/CMakeLists.txt +++ b/kms++util/CMakeLists.txt @@ -1,3 +1,5 @@ +include_directories(${LIBDRM_INCLUDE_DIRS}) + file(GLOB SRCS "src/*.cpp" "src/*.h") file(GLOB PUB_HDRS "inc/kms++util/*.h") add_library(kms++util ${SRCS} ${PUB_HDRS}) diff --git a/kms++util/src/resourcemanager.cpp b/kms++util/src/resourcemanager.cpp index 5a9f016c06ab..01edaf39202b 100644 --- a/kms++util/src/resourcemanager.cpp +++ b/kms++util/src/resourcemanager.cpp @@ -2,6 +2,8 @@ #include #include +#include + using namespace kms; using namespace std; @@ -20,6 +22,9 @@ void ResourceManager::reset() static Connector* find_connector(Card& card, const set reserved) { for (Connector* conn : card.get_connectors()) { + if (conn->connector_type() == DRM_MODE_CONNECTOR_WRITEBACK) + continue; + if (!conn->connected()) continue; diff --git a/py/pykms/pykmsbase.cpp b/py/pykms/pykmsbase.cpp index 0448e0264ded..8276b72b663b 100644 --- a/py/pykms/pykmsbase.cpp +++ b/py/pykms/pykmsbase.cpp @@ -47,6 +47,7 @@ void init_pykmsbase(py::module &m) }) .def_property_readonly("has_atomic", &Card::has_atomic) + .def_property_readonly("has_writeback", &Card::has_writeback) .def("get_prop", (Property* (Card::*)(uint32_t) const)&Card::get_prop) .def_property_readonly("version_name", &Card::version_name); diff --git a/utils/kmsblank.cpp b/utils/kmsblank.cpp index 286c7f793e6d..fa18510e7299 100644 --- a/utils/kmsblank.cpp +++ b/utils/kmsblank.cpp @@ -5,6 +5,8 @@ #include #include +#include + using namespace std; using namespace kms; @@ -79,6 +81,9 @@ int main(int argc, char **argv) while (true) { for (Connector* conn : conns) { + if (conn->connector_type() == DRM_MODE_CONNECTOR_WRITEBACK) + continue; + if (!conn->connected()) { printf("Connector %u not connected\n", conn->idx()); continue; diff --git a/utils/kmstest.cpp b/utils/kmstest.cpp index b4bf24b52a1b..39b4b9d352a6 100644 --- a/utils/kmstest.cpp +++ b/utils/kmstest.cpp @@ -17,6 +17,8 @@ #include +#include + using namespace std; using namespace kms; @@ -643,6 +645,8 @@ static vector setups_to_outputs(Card& card, ResourceManager& resman, if (outputs.empty()) { // no outputs defined, show a pattern on all connected screens for (Connector* conn : card.get_connectors()) { + if (conn->connector_type() == DRM_MODE_CONNECTOR_WRITEBACK) + continue; if (!conn->connected()) continue; From patchwork Sun Aug 23 22:11:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11731929 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CE77739 for ; Sun, 23 Aug 2020 22:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8189020724 for ; Sun, 23 Aug 2020 22:12:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RDOZe0YU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726794AbgHWWMo (ORCPT ); Sun, 23 Aug 2020 18:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726752AbgHWWMn (ORCPT ); Sun, 23 Aug 2020 18:12:43 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A24C061573 for ; Sun, 23 Aug 2020 15:12:43 -0700 (PDT) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E52C6574; Mon, 24 Aug 2020 00:12:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598220756; bh=UipJGceDZ8yd8Tv3M4UXdcBI8MhD5lZ0bMpYfCO635Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDOZe0YUeHad+4s/s/fWM+PL9lKl4VsynjdzCBfhTaiXXP7qjZdxcZLzBWeoycJfk kMVEi1L7GgNQCOdAh04OLUofU8r5axY1zyVn/BAzHzu065PSTkwVCys2dsVmB6/FsP pLVTRqnotE6FUug6iKfzsKQW6hWnRhR/NKxEO3hQ= From: Laurent Pinchart To: Tomi Valkeinen Cc: linux-renesas-soc@vger.kernel.org Subject: [kmsxx] [PATCH 2/2] utils: Add a dump_framebuffer() method Date: Mon, 24 Aug 2020 01:11:52 +0300 Message-Id: <20200823221152.31978-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200823221152.31978-1-laurent.pinchart@ideasonboard.com> References: <20200823221152.31978-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Add a new method to write the contents of a framebuffer to a file descriptor. This can be used to capture frames from writeback connectors. Signed-off-by: Laurent Pinchart --- kms++util/inc/kms++util/kms++util.h | 2 ++ kms++util/src/drawing.cpp | 7 +++++++ py/pykms/pykmsutil.cpp | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/kms++util/inc/kms++util/kms++util.h b/kms++util/inc/kms++util/kms++util.h index 8fc6c8b81e48..58ad7e6ef39f 100644 --- a/kms++util/inc/kms++util/kms++util.h +++ b/kms++util/inc/kms++util/kms++util.h @@ -29,6 +29,8 @@ void draw_text(IFramebuffer& buf, uint32_t x, uint32_t y, const std::string& str void draw_color_bar(IFramebuffer& buf, int old_xpos, int xpos, int width); void draw_test_pattern(IFramebuffer &fb, YUVType yuvt = YUVType::BT601_Lim); + +void dump_framebuffer(IFramebuffer &fb, int fd); } #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/kms++util/src/drawing.cpp b/kms++util/src/drawing.cpp index 3752f94695e0..24a995489a9e 100644 --- a/kms++util/src/drawing.cpp +++ b/kms++util/src/drawing.cpp @@ -1,5 +1,6 @@ #include +#include #include #include @@ -569,4 +570,10 @@ void draw_text(IFramebuffer& buf, uint32_t x, uint32_t y, const string& str, RGB draw_char(buf, (x + 8 * i), y, str[i], color); } +void dump_framebuffer(IFramebuffer &fb, int fd) +{ + for (unsigned int i = 0; i < fb.num_planes(); ++i) + ::write(fd, fb.map(i), fb.size(i)); +} + } diff --git a/py/pykms/pykmsutil.cpp b/py/pykms/pykmsutil.cpp index d5d7fde4a4e1..92d8ebc684b9 100644 --- a/py/pykms/pykmsutil.cpp +++ b/py/pykms/pykmsutil.cpp @@ -61,5 +61,9 @@ void init_pykmstest(py::module &m) draw_circle(fb, xCenter, yCenter, radius, color); } ); m.def("draw_text", [](Framebuffer& fb, uint32_t x, uint32_t y, const string& str, RGB color) { - draw_text(fb, x, y, str, color); } ); + draw_text(fb, x, y, str, color); + } ); + m.def("dump_framebuffer", [](Framebuffer& fb, int fd) { + dump_framebuffer(fb, fd); + } ); }