From patchwork Fri Dec 12 00:29:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25516 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 14497BD1F1 for ; Fri, 12 Dec 2025 00:33:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BB3B161623; Fri, 12 Dec 2025 01:33:27 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="oHdE+QPo"; dkim-atps=neutral Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3ED7E61613 for ; Fri, 12 Dec 2025 01:33:25 +0100 (CET) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7b7828bf7bcso718235b3a.2 for ; Thu, 11 Dec 2025 16:33:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765499604; x=1766104404; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q4G+/DobTRCRFFgGje+jTAlgyU0g2iZaIgwaHTHs6zc=; b=oHdE+QPohMRukKQ9QVleMVLI/fvNGYttp3dOAUpiS0iljeWf5u/QfxRP2rRPWhxHnv Onpjdi7yC/CKSTg3E2j3uRJcfxG3tG2yUqmCo6sghBomtIcg8lfkmbqyjk2nIQAanFR5 CkMCZ6HUOzb4NxoLNfqzA9IMcTXAM4kLAzG8rKAjh4On+ju+s9fDecohFz9Pk8TdvIeT C4VqxbLlEGAVd1MRB69gJkJwHpYDSx21HL+Z27wW2CCzTNFcWF5cVLC0gJv9HMru1l/c 0Af25IHFhbxWz3jPFZhray+KNg+kHC5e2ArLD6Y0i6Vp0I3Cuv+TV7WQP5iaI7163Inh sHfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765499604; x=1766104404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Q4G+/DobTRCRFFgGje+jTAlgyU0g2iZaIgwaHTHs6zc=; b=nu7Vdy28S1EEmPrkEnq+9MA5ckSa4tU0lbdzv/jVH0onNSFNksa/sqGH3gnHtXEIEp BGpr9XRF2prx/nvD3Hev/J0pWzknIMDcZJFVkxH6QGColZlGFU5hEYUicM12OMZ+wiCR rOYFPA6XorAM4cYlw9xQKQmhXiiom2WU6F6axN/Kit5j1hDGKbO1Y6U2Uxu9vamFluCv PZBukaAXoJY2zL4wtJsnRtcBikNQZwY+ihMr2aZRlydit1Hi01zyyMRoCdp8mREljVbl 7tQh9ioMxdq0H/9pdi7Kz5UQCE16IyTgc5uBQh05FdehAp0LoKv8/C1D0Tg3WZAoGqDO XwZA== X-Gm-Message-State: AOJu0Yx0yoCO4tJSlON+bSJyX4MV/81oQXlYVaw5gzWatrA3iz/4JSat hdt1KmKnISLAWBDniSonMUChyJsJUiX17IzYZXohWb2sehHuFLqOs054RjvUj2tbz7uLOqjv1T5 6keg3 X-Gm-Gg: AY/fxX78tScipSSFux7YECT7p69wWWcwJ2CqBDyrJ/myVhrqZyCpTe4WSgH8fYxDJaP iZy6XAH/wdiKIdTjd/usT+4s7f+th6wm2ffzgZmf9SLWAQyAYvRiPCBFpYq8KjHJg9O9KYLBMI5 ZsSJ6pnXJs0YJ4rp4zn9bRTprVCDtHH3deD58+JBRi1oT8VtnhOGqpjRw4A21xup2To5ergdyV0 Kwrb6W/EU+75ZAhnamOFVqDCQHdEMkfn+C/SNuWXuWcIWdskpr9p2bg/puXw37lZ/81uO4mJ8JJ Sy9UIXHiUbtPXdAhRmo2/YMSMV7grNXbKyXtPH+JtxYJ+li2CpHmTMuUfEj5mARChuqHYh248xg +XtQXuWzj3hdo8nkV1hRcpT9ntywvTGUmJLCENN8rOgfoBy04nr0dscTNS/1WWrd4Uq1lXceSB/ d5vjaOwbAazpPGohevAq0hjfeS0vVrgH9YXy8Ybu6V8+RJ8hnEh1GZNfn8Bsua74qChR5GQA== X-Google-Smtp-Source: AGHT+IEJt/wRmmkrWUJlbUTkbwoxANdfIpff0nUJuUngpEjMtYZnf00gnXF0y+f+N9lnzorGtB80Mw== X-Received: by 2002:a05:6a20:914e:b0:35d:d477:a7d8 with SMTP id adf61e73a8af0-369ae4901dcmr337317637.36.1765499603507; Thu, 11 Dec 2025 16:33:23 -0800 (PST) Received: from inspiron14p-linux (p99250-ipoefx.ipoe.ocn.ne.jp. [153.246.134.249]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c0c26eb0f6bsm3317282a12.14.2025.12.11.16.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 16:33:22 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Kieran Bingham Subject: [PATCH v8 01/26] libcamera: software_isp: gbm: Add a GBM helper class for GPU surface access Date: Fri, 12 Dec 2025 00:29:12 +0000 Message-ID: <20251212002937.3118-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251212002937.3118-1-bryan.odonoghue@linaro.org> References: <20251212002937.3118-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 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" A helper class to interact with GBM. This will allow us to specify the internal storage format of the GPU when making a texture for the Debayer vertex/fragment shaders and thus ensure we receive an uncompressed and untiled output buffer. Acked-by: Kieran Bingham Signed-off-by: Bryan O'Donoghue --- include/libcamera/internal/gbm.h | 39 ++++++++ include/libcamera/internal/meson.build | 1 + src/libcamera/gbm.cpp | 130 +++++++++++++++++++++++++ src/libcamera/meson.build | 10 ++ 4 files changed, 180 insertions(+) create mode 100644 include/libcamera/internal/gbm.h create mode 100644 src/libcamera/gbm.cpp diff --git a/include/libcamera/internal/gbm.h b/include/libcamera/internal/gbm.h new file mode 100644 index 000000000..09811d1ef --- /dev/null +++ b/include/libcamera/internal/gbm.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Linaro Ltd. + * + * Authors: + * Bryan O'Donoghue + * + * Helper class for managing GBM interactions + */ + +#pragma once + +#include + +#include + +#include + +namespace libcamera { + +LOG_DECLARE_CATEGORY(GBM) + +class GBM +{ +public: + GBM(); + ~GBM(); + + int createDevice(); + struct gbm_device *getDevice(); + PixelFormat getPixelFormat(); + +private: + int fd_; + struct gbm_device *gbmDevice_; + PixelFormat format_; +}; + +} /* namespace libcamera */ diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index e9540a2f7..b8324996b 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -23,6 +23,7 @@ libcamera_internal_headers = files([ 'dma_buf_allocator.h', 'formats.h', 'framebuffer.h', + 'gbm.h', 'global_configuration.h', 'ipa_data_serializer.h', 'ipa_manager.h', diff --git a/src/libcamera/gbm.cpp b/src/libcamera/gbm.cpp new file mode 100644 index 000000000..a2e4c7076 --- /dev/null +++ b/src/libcamera/gbm.cpp @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Linaro Ltd. + * + * Authors: + * Bryan O'Donoghue + * + * Helper class for managing GBM interactions + */ + +#include "libcamera/internal/gbm.h" + +#include +#include +#include +#include +#include + +#include +#include + +namespace libcamera { + +LOG_DEFINE_CATEGORY(GBM) + +/** + * \class GBM + * \brief Helper class for managing GBM interactions + * + * The GBM class provides a simplified interface for creating and managing + * GBM devices. It handles the initialization and teardown of GBM devices + * used for buffer allocation in graphics and camera pipelines. + * + * This class is responsible for opening a DRI render node, creating a GBM + * device, and providing access to the device and its associated pixel format. + */ + +/** + *\var GBM::fd_ + *\brief file descriptor to DRI device + */ + +/** + *\var GBM::gbmDevice_ + *\brief Pointer to GBM device structure derived from fd_ + */ + +/** + *\var GBM::format_ + *\brief Pixel format the GBM surface was created in + */ + +/** + *\brief GBM constructor. + * + * Creates a GBM instance with unitialised state. + */ +GBM::GBM() +{ + fd_ = 0; + gbmDevice_ = nullptr; +} + +/** + *\brief GBM destructor + * + * Cleans up the GBM device if it was successfully created, and closes + * the associated file descriptor. + */ +GBM::~GBM() +{ + if (gbmDevice_) + gbm_device_destroy(gbmDevice_); +} + +/** + * \brief Create and initialize a GBM device + * + * \todo Get dri device name from envOption setting + * + * Opens the DRI render node (/dev/dri/renderD128) and creates a GBM + * device using the libgbm library. Sets the default pixel format to + * ARGB8888. + * + * \return 0 on success, or a negative error code on failure + */ +int GBM::createDevice() +{ + const char *dri_node = "/dev/dri/renderD128"; + + fd_ = open(dri_node, O_RDWR | O_CLOEXEC); + if (fd_ < 0) { + LOG(GBM, Error) << "Open " << dri_node << " fail " << fd_; + return fd_; + } + + gbmDevice_ = gbm_create_device(fd_); + if (!gbmDevice_) { + LOG(GBM, Error) << "gbm_create_device fail"; + close(fd_); + return -errno; + } + + format_ = libcamera::formats::ARGB8888; + + return 0; +} + +/** + * \brief Retrieve the GBM device handle + * + * \return Pointer to the gbm_device structure, or nullptr if the device + * has not been created + */ +struct gbm_device * GBM::getDevice() +{ + return gbmDevice_; +} + +/** + * \brief Retrieve the pixel format + * + * \return The PixelFormat used by this GBM instance (ARGB8888) + */ + +PixelFormat GBM::getPixelFormat() +{ + return format_; +} +} /* namespace libcamera */ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 90d434a5a..685213c78 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -70,6 +70,15 @@ libcamera_deps = [] libatomic = cc.find_library('atomic', required : false) libthreads = dependency('threads') +libgbm = cc.find_library('gbm', required: false) +gbm_works = cc.check_header('gbm.h', required: false) + +if libgbm.found() and gbm_works + libcamera_internal_sources += files([ + 'gbm.cpp', + ]) +endif + subdir('base') subdir('converter') subdir('ipa') @@ -178,6 +187,7 @@ libcamera_deps += [ libcamera_base_private, libcrypto, libdl, + libgbm, liblttng, libudev, libyaml,