gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From 85a85537b17742a839092bcc2a4684ab0bdb65d5 Mon Sep 17 00:00:00 2001
   2 From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
   3 Date: Tue, 4 Jan 2022 23:52:31 +0900
   4 Subject: [PATCH] Add drm-lease client support to eglfs kms backend
   5
   6 This patch is adding drm-lease-manager client support to Qt eglfs backend.
   7 When this patch is enable, Qt wayland compositor and Qt eglfs without
   8 compositor possible to use leased drm device.
   9
  10 List of environment variable:
  11
  12 QT_QPA_EGLFS_DRMLEASE :
  13     When this variable is set, drm-lease-manager client support is enable.
  14     Shall set drm lease device such as  `card0-LVDS-1`, `card0-HDMI-A-1 ` and etc.
  15
  16 DLM_RUNTIME_PATH :
  17     It use drm-lease-manager client, typically it need to set own.
  18
  19 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
  20 ---
  21  cmake/3rdparty/kwin/FindLibdlmclient.cmake    | 127 ++++++++++++++++++
  22  src/gui/configure.cmake                       |   1 +
  23  .../eglfs_kms/CMakeLists.txt                  |   2 +
  24  .../eglfs_kms/qeglfskmsgbmdevice.cpp          |  43 ++++--
  25  .../eglfs_kms/qeglfskmsgbmdevice_p.h          |   4 +
  26  5 files changed, 167 insertions(+), 10 deletions(-)
  27  create mode 100644 cmake/3rdparty/kwin/FindLibdlmclient.cmake
  28
  29 diff --git a/cmake/3rdparty/kwin/FindLibdlmclient.cmake b/cmake/3rdparty/kwin/FindLibdlmclient.cmake
  30 new file mode 100644
  31 index 0000000000..8dfac920ca
  32 --- /dev/null
  33 +++ b/cmake/3rdparty/kwin/FindLibdlmclient.cmake
  34 @@ -0,0 +1,127 @@
  35 +#.rst:
  36 +# FindLibdlmclient
  37 +# -------
  38 +# FindLibdlmclient.cmake is created based on FindLibinput.cmake
  39 +#
  40 +# Try to find libdlmclient on a Unix system.
  41 +#
  42 +# This will define the following variables:
  43 +#
  44 +# ``Libdlmclient_FOUND``
  45 +#     True if (the requested version of) libdlmclient is available
  46 +# ``Libdlmclient_VERSION``
  47 +#     The version of libdlmclient
  48 +# ``Libdlmclient_LIBRARIES``
  49 +#     This can be passed to target_link_libraries() instead of the ``Libdlmclient::Libdlmclient``
  50 +#     target
  51 +# ``Libdlmclient_INCLUDE_DIRS``
  52 +#     This should be passed to target_include_directories() if the target is not
  53 +#     used for linking
  54 +# ``Libdlmclient_DEFINITIONS``
  55 +#     This should be passed to target_compile_options() if the target is not
  56 +#     used for linking
  57 +#
  58 +# If ``Libdlmclient_FOUND`` is TRUE, it will also define the following imported target:
  59 +#
  60 +# ``Libdlmclient::Libdlmclient``
  61 +#     The libdlmclient library
  62 +#
  63 +# In general we recommend using the imported target, as it is easier to use.
  64 +# Bear in mind, however, that if the target is in the link interface of an
  65 +# exported library, it must be made available by the package config file.
  66 +
  67 +#=============================================================================
  68 +# Copyright 2014 Alex Merry <alex.merry@kde.org>
  69 +# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
  70 +# Copyright 2022 Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
  71 +#
  72 +# Redistribution and use in source and binary forms, with or without
  73 +# modification, are permitted provided that the following conditions
  74 +# are met:
  75 +#
  76 +# 1. Redistributions of source code must retain the copyright
  77 +#    notice, this list of conditions and the following disclaimer.
  78 +# 2. Redistributions in binary form must reproduce the copyright
  79 +#    notice, this list of conditions and the following disclaimer in the
  80 +#    documentation and/or other materials provided with the distribution.
  81 +# 3. The name of the author may not be used to endorse or promote products
  82 +#    derived from this software without specific prior written permission.
  83 +#
  84 +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  85 +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  86 +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  87 +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  88 +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  89 +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  90 +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  91 +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  92 +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  93 +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  94 +#=============================================================================
  95 +
  96 +if(CMAKE_VERSION VERSION_LESS 2.8.12)
  97 +    message(FATAL_ERROR "CMake 2.8.12 is required by FindLibdlmclient.cmake")
  98 +endif()
  99 +if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
 100 +    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindLibdlmclient.cmake")
 101 +endif()
 102 +
 103 +if(NOT WIN32)
 104 +    # Use pkg-config to get the directories and then use these values
 105 +    # in the FIND_PATH() and FIND_LIBRARY() calls
 106 +    find_package(PkgConfig QUIET)
 107 +    pkg_check_modules(PKG_Libdlmclient QUIET libdlmclient)
 108 +
 109 +    set(Libdlmclient_DEFINITIONS ${PKG_Libdlmclient_CFLAGS_OTHER})
 110 +    set(Libdlmclient_VERSION ${PKG_Libdlmclient_VERSION})
 111 +
 112 +    find_path(Libdlmclient_INCLUDE_DIR
 113 +        NAMES
 114 +            dlmclient.h
 115 +        HINTS
 116 +            ${PKG_Libdlmclient_INCLUDE_DIRS}
 117 +    )
 118 +    find_library(Libdlmclient_LIBRARY
 119 +        NAMES
 120 +            dlmclient
 121 +        HINTS
 122 +            ${PKG_Libdlmclient_LIBRARY_DIRS}
 123 +    )
 124 +
 125 +    include(FindPackageHandleStandardArgs)
 126 +    find_package_handle_standard_args(Libdlmclient
 127 +        FOUND_VAR
 128 +            Libdlmclient_FOUND
 129 +        REQUIRED_VARS
 130 +            Libdlmclient_LIBRARY
 131 +            Libdlmclient_INCLUDE_DIR
 132 +        VERSION_VAR
 133 +            Libdlmclient_VERSION
 134 +    )
 135 +
 136 +    if(Libdlmclient_FOUND AND NOT TARGET Libdlmclient::Libdlmclient)
 137 +        add_library(Libdlmclient::Libdlmclient UNKNOWN IMPORTED)
 138 +        set_target_properties(Libdlmclient::Libdlmclient PROPERTIES
 139 +            IMPORTED_LOCATION "${Libdlmclient_LIBRARY}"
 140 +            INTERFACE_COMPILE_OPTIONS "${Libdlmclient_DEFINITIONS}"
 141 +            INTERFACE_INCLUDE_DIRECTORIES "${Libdlmclient_INCLUDE_DIR}"
 142 +        )
 143 +    endif()
 144 +
 145 +    mark_as_advanced(Libdlmclient_LIBRARY Libdlmclient_INCLUDE_DIR)
 146 +
 147 +    # compatibility variables
 148 +    set(Libdlmclient_LIBRARIES ${Libdlmclient_LIBRARY})
 149 +    set(Libdlmclient_INCLUDE_DIRS ${Libdlmclient_INCLUDE_DIR})
 150 +    set(Libdlmclient_VERSION_STRING ${Libdlmclient_VERSION})
 151 +
 152 +else()
 153 +    message(STATUS "FindLibdlmclient.cmake cannot find libdlmclient on Windows systems.")
 154 +    set(Libdlmclient_FOUND FALSE)
 155 +endif()
 156 +
 157 +include(FeatureSummary)
 158 +set_package_properties(Libdlmclient PROPERTIES
 159 +    URL "https://git.automotivelinux.org/src/drm-lease-manager/"
 160 +    DESCRIPTION "The DRM Lease Manager uses the DRM Lease feature, introduced in the Linux kernel version 4.15, to partition display controller output resources between multiple processes."
 161 +)
 162 diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
 163 index 0bf250eab6..b092b746c0 100644
 164 --- a/src/gui/configure.cmake
 165 +++ b/src/gui/configure.cmake
 166 @@ -38,6 +38,7 @@ endif()
 167  qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig)
 168  qt_add_qmake_lib_dependency(fontconfig freetype)
 169  qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
 170 +qt_find_package(Libdlmclient PROVIDED_TARGETS Libdlmclient::Libdlmclient MODULE_NAME gui QMAKE_LIB libdlmclient)
 171  qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
 172  qt_find_package(Libinput PROVIDED_TARGETS Libinput::Libinput MODULE_NAME gui QMAKE_LIB libinput)
 173  qt_find_package(JPEG PROVIDED_TARGETS JPEG::JPEG MODULE_NAME gui QMAKE_LIB libjpeg)
 174 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
 175 index a20a4a084d..2af7904eb6 100644
 176 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
 177 +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
 178 @@ -23,6 +23,7 @@ qt_internal_add_module(EglFsKmsGbmSupportPrivate
 179          Qt::GuiPrivate
 180          Qt::KmsSupportPrivate
 181          gbm::gbm
 182 +        Libdlmclient::Libdlmclient
 183  )
 184  #####################################################################
 185  ## QEglFSKmsGbmIntegrationPlugin Plugin:
 186 @@ -44,6 +45,7 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
 187          Qt::GuiPrivate
 188          Qt::KmsSupportPrivate
 189          gbm::gbm
 190 +        Libdlmclient::Libdlmclient
 191  )
 192
 193  #### Keys ignored in scope 3:.:.:eglfs_kms-plugin.pro:<TRUE>:
 194 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
 195 index b5b7811b79..1e77c72ee5 100644
 196 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
 197 +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
 198 @@ -56,32 +56,51 @@ Q_DECLARE_LOGGING_CATEGORY(qLcEglfsKmsDebug)
 199  QEglFSKmsGbmDevice::QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path)
 200      : QEglFSKmsDevice(screenConfig, path)
 201      , m_gbm_device(nullptr)
 202 +    , m_lease(nullptr)
 203      , m_globalCursor(nullptr)
 204  {
 205  }
 206
 207  bool QEglFSKmsGbmDevice::open()
 208  {
 209 +    QByteArray lease = qgetenv("QT_QPA_EGLFS_DRMLEASE");
 210 +    int drmfd = -1;
 211      Q_ASSERT(fd() == -1);
 212      Q_ASSERT(m_gbm_device == nullptr);
 213
 214 -    int fd = qt_safe_open(devicePath().toLocal8Bit().constData(), O_RDWR | O_CLOEXEC);
 215 -    if (fd == -1) {
 216 -        qErrnoWarning("Could not open DRM device %s", qPrintable(devicePath()));
 217 -        return false;
 218 +    if (lease.isEmpty()) {
 219 +        drmfd = qt_safe_open(devicePath().toLocal8Bit().constData(), O_RDWR | O_CLOEXEC);
 220 +        if (drmfd == -1) {
 221 +            qErrnoWarning("Could not open DRM device %s", qPrintable(devicePath()));
 222 +            return false;
 223 +        }
 224 +    } else {
 225 +        QString lease_path(QString::fromUtf8(lease));
 226 +
 227 +        m_lease = ::dlm_get_lease(lease_path.toLocal8Bit().constData());
 228 +        if (m_lease == nullptr) {
 229 +            qErrnoWarning("Could not open DRM lease %s", qPrintable(lease_path));
 230 +            return false;
 231 +        }
 232 +        drmfd = dlm_lease_fd(m_lease);
 233      }
 234
 235 -    qCDebug(qLcEglfsKmsDebug) << "Creating GBM device for file descriptor" << fd
 236 +    qCDebug(qLcEglfsKmsDebug) << "Creating GBM device for file descriptor" << drmfd
 237                                << "obtained from" << devicePath();
 238 -    m_gbm_device = gbm_create_device(fd);
 239 +    m_gbm_device = gbm_create_device(drmfd);
 240      if (!m_gbm_device) {
 241          qErrnoWarning("Could not create GBM device");
 242 -        qt_safe_close(fd);
 243 -        fd = -1;
 244 +        if (m_lease) {
 245 +            ::dlm_release_lease(m_lease);
 246 +            m_lease = nullptr;
 247 +        } else {
 248 +            qt_safe_close(drmfd);
 249 +        }
 250 +        drmfd = -1;
 251          return false;
 252      }
 253
 254 -    setFd(fd);
 255 +    setFd(drmfd);
 256
 257      m_eventReader.create(this);
 258
 259 @@ -99,7 +118,11 @@ void QEglFSKmsGbmDevice::close()
 260          m_gbm_device = nullptr;
 261      }
 262
 263 -    if (fd() != -1) {
 264 +    if (m_lease) {
 265 +        setFd(-1);
 266 +        ::dlm_release_lease(m_lease);
 267 +        m_lease = nullptr;
 268 +    } else if (fd() != -1) {
 269          qt_safe_close(fd());
 270          setFd(-1);
 271      }
 272 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h
 273 index bb67d800ee..b2d705800e 100644
 274 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h
 275 +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice_p.h
 276 @@ -57,6 +57,7 @@
 277  #include <private/qeglfskmsdevice_p.h>
 278
 279  #include <gbm.h>
 280 +#include <dlmclient.h>
 281
 282  QT_BEGIN_NAMESPACE
 283
 284 @@ -92,6 +93,9 @@ private:
 285
 286      gbm_device *m_gbm_device;
 287
 288 +    // only used for DRM lease
 289 +    struct dlm_lease *m_lease;
 290 +
 291      QEglFSKmsGbmCursor *m_globalCursor;
 292  };
 293
 294 --
 295 2.25.1
 296