From patchwork Sun Aug 24 00:48:34 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: 24204 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 0C09DBEFBE for ; Sun, 24 Aug 2025 00:49:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3FFB269312; Sun, 24 Aug 2025 02:49:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wagop2wE"; dkim-atps=neutral Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7887A69317 for ; Sun, 24 Aug 2025 02:48:56 +0200 (CEST) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3c79f0a5b8bso660159f8f.1 for ; Sat, 23 Aug 2025 17:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996536; x=1756601336; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Kn95fqpa0M3VlH/ov1S+PHQQo16NVdFOXN/7e6MZaAs=; b=wagop2wEfAAM3vlTHIe8E5vNTOLQfLARlsBH5naFejBdAsUbHeT6hnZQ5SQhXFHCEj 7qxMtZhzstjd03HOnGy/r+a1gUIcYqHsXx4mhH8QS18dXNbobt5WEED8r2OMKvjjbJK8 fK3CZcAzZW9n7JRDi3/aX2tpJ6Bt/SubLObtdTFjiri9bH31WFBsLfTtW8x2yO+pE/+W 3aXQ+6JZDtCG5dkaoIEAZePv6JLmsB5f4fBEtxeVscMwFTSKV/U8bytFt4oskr0uH+oA JWAQ32MZxffnMAAxfY/JteLAi6UBOEmKRBZ0BZTspfaXfzsu+E2lk69rh3MQKZuafGAS ZKHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996536; x=1756601336; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kn95fqpa0M3VlH/ov1S+PHQQo16NVdFOXN/7e6MZaAs=; b=Wwc8UCt1I+lud5dU0rgURSGf0WYtPdEdLHdlL4rPC0ZYDBkd9WhD9yW+DuZQ+OzffD ljpWylRsvBkSpks+qVvFjuttPKaxcxnvyf0up+V/K+j23CS1XdCKwG0TrJq2mqT8d5kv xWK7YbkbZbdCb7tpj+KpS95DTreWbVN4kVRUilzcIlVBfWxRrJ6px90w2ELyGZ1QfvOh svR77zbqs3/XnNQU9ZS6O9Psarcd555P9VtHGZdWgPVmDwpUe42U7r2eispzuTrMzbUr HR2L1MneGC5vmxaqnVDUSLAjop1kTgxdLSv94CFkoVX5QrY/lmJXqKzBY0dIbihciEeo B/rA== X-Gm-Message-State: AOJu0Yy534JyjiVd3MsO7N1/Fz4vb09qwiEPL3E7mdt7Ffi+AMhAnI8J 7nbFf564gtiwvDdFNJevemziuNM5Bb0VCmjo1Hfo9B4ddtu31NNGK7c/mNjqFXRMEUd0UEkDVlO glpcgudU= X-Gm-Gg: ASbGncuO+T+JOKZxXRJzpNti/9hRzuZN6Qex7LN/7jMBVzTUKIws9tY1mnWMDWwwtWL 9m4/doQBJF6CIA3V7xItTJpWZsJrIjnV4tAAi2ihprg88CFopd1/dX5qbIRhJRCfxNnMOcEzRvD qbvV8+rmR/V8E+vf9JgzY8+WN5Sz4FcfdyhKjvqIYFSdDtQRc9ag9uNi+Er5yYqiK3yYIosQ5GV V7Y0GYB2vywxyFNe3UBce8bgXuU6va17XL5qK+krNBUNPEddpSF/snDCAS2UVdNW13lSPgK0JF2 +0c/feq+oihQusnHU000xtoqJsuQjXkxmwSaf7MThxuYV1qDp+b79ubPBmvRc7bPS60ghpvahwj 5IYm8R5hMsR2+vLfMyMdN0P/w29RkzSomDRP0JUqbqk/V4YOkRRe3lPZ3A4pSqQHG1H/95UBuq6 rrkKXZagZ087kuw6r73l2InF0N7sJFo9M= X-Google-Smtp-Source: AGHT+IHHL3bDAY4Rrw3j94OMpBcONvwEGj8WSUdXtO01KObhnqwoJ6IY8zCws4t9foTcUhqNUsGJVw== X-Received: by 2002:a05:6000:2211:b0:3b9:7bea:14da with SMTP id ffacd0b85a97d-3c5dcdfd479mr5160578f8f.29.1755996535948; Sat, 23 Aug 2025 17:48:55 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:55 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:34 +0100 Subject: [PATCH v2 22/37] libcamera: software_isp: gbm: Add in a GBM helper class for GPU surface access MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-22-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4346; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=egsSMfvlLEe6bXc52sk6IMnd2gt0PPvVs9ZsgHzSO90=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFg1GoWTLssI0JidAMdp2Ruvm9b7J1y7yS4C mfpfmkZnwuJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphYAAKCRAicTuzoY3I OtdPD/92DrNp7bLmefiMO7HIqCjzcBRjpPkt1PrQXqqnFAFo+ndKr3z7J1t6PKjj28/6kodO+3R 5QYVm6wTH0gCRBYCGKc/EipFYOe+gMBaBlrB6zwBNFg0uZIHPJJGzNHXtDVRPE37S2pU+NNMY3P RWOrn00B1h5tpH7L4n0lMgayc2ziQ8+MDZDlCFaEDeO1ZZb79NNBli7nIOTIHv+Zwr6fcTGicd0 gSIwTjOmnby3rszaOou3F7P9CBUivf3YoyvSO3gc1O4dKMbGH/iwamI5pBqgpuJTDU+xqcPgKnr qLYgFjLeqjKmK/6XLNr5SI8yR2lFACpFEuZrlPSyvwLtcF6odSDQ4RR59rdEzTLzsDsmHtumnxl c7nUkwLDZMbigiC8iYTJ+BJVikciiMyuFWuvz5eZvXaYB22WDmdJMSOY1Osgn5+pErIcPFzQLo1 6pZF1CWpXU0cmNcI+bWvpl+VDTiqBtYu32VCZCczi3xG+iCTXax5U8h4fnbsB6NEvINureEQo4B lX0W9HI5sTLWwX5aCD0mWEa2Ef0I6KSS2CknRpmUCNNn1b/9qx50A940nhyi9tVwl5/1zclZFrp S/PUPO+ZhY8CeqHCG6NU8uNwVhFXu0Ysk7vsq8DH9zdh74kB3h0SaahPqNjsUPFeF56x8o+tNkS faHEx28BWTjlXVQ== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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 CPU when making a texture for the Debayer vertext/fragment shaders and thus ensure we receive an uncompressed and untiled output buffer. Signed-off-by: Bryan O'Donoghue --- include/libcamera/internal/gbm.h | 39 ++++++++++++++++++++++ include/libcamera/internal/meson.build | 1 + src/libcamera/gbm.cpp | 61 ++++++++++++++++++++++++++++++++++ src/libcamera/meson.build | 11 ++++++ 4 files changed, 112 insertions(+) diff --git a/include/libcamera/internal/gbm.h b/include/libcamera/internal/gbm.h new file mode 100644 index 0000000000000000000000000000000000000000..ccf7b2da54eebb1b69a5b7c050eed778c199ac8f --- /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 + * + * gbm.h - 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() { return gbm_device_; } + PixelFormat getPixelFormat() { return format_; } + +private: + int fd_; + struct gbm_device *gbm_device_; + PixelFormat format_; +}; + +} // namespace libcamera diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 90155857e44fc64803df5b5a054ad62e48b8e2f5..6c65254ddd95fbe9cbb6dadafc0826226b895a7f 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -24,6 +24,7 @@ libcamera_internal_headers = files([ 'dma_buf_allocator.h', 'formats.h', 'framebuffer.h', + 'gbm.h', 'ipa_data_serializer.h', 'ipa_manager.h', 'ipa_module.h', diff --git a/src/libcamera/gbm.cpp b/src/libcamera/gbm.cpp new file mode 100644 index 0000000000000000000000000000000000000000..caf9ca1c742ce3269ec10f0b6394f9821dabd932 --- /dev/null +++ b/src/libcamera/gbm.cpp @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024, Linaro Ltd. + * + * Authors: + * Bryan O'Donoghue + * + * egl.cpp - Helper class for managing GBM interactions. + */ + +#include "libcamera/internal/gbm.h" + +#include +#include +#include +#include + +#include +#include + +namespace libcamera { + +LOG_DEFINE_CATEGORY(GBM) + +GBM::GBM() +{ + fd_ = 0; +} + +GBM::~GBM() +{ + if (gbm_device_) + gbm_device_destroy(gbm_device_); + + if (fd_ >= 0) + close(fd_); +} + +int GBM::createDevice() +{ + const char *dri_node = "/dev/dri/renderD128"; //TODO: get from an env or config setting + + fd_ = open(dri_node, O_RDWR | O_CLOEXEC); + if (fd_ < 0) { + LOG(GBM, Error) << "Open " << dri_node << " fail " << fd_; + return fd_; + } + + gbm_device_ = gbm_create_device(fd_); + if (!gbm_device_) { + LOG(GBM, Error) << "gbm_crate_device fail"; + goto fail; + } + + format_ = libcamera::formats::ARGB8888; + + return 0; +fail: + return -ENODEV; +} +} //namespace libcamera diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index de1eb99b28fdb07b78b529ed21d9d584675d50ae..64270b571cea2ece8d4dfea8a23b8edf60de70d3 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -68,6 +68,16 @@ 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 + config_h.set('HAVE_GBM', 1) + libcamera_internal_sources += files([ + 'gbm.cpp', + ]) +endif + subdir('base') subdir('converter') subdir('ipa') @@ -181,6 +191,7 @@ libcamera_deps += [ libcamera_base_private, libcrypto, libdl, + libgbm, liblttng, libudev, libyaml,