From patchwork Tue Apr 22 21:59:06 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: 23226 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 DA707C327D for ; Tue, 22 Apr 2025 21:59:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7285B68B44; Tue, 22 Apr 2025 23:59:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wDRew07J"; dkim-atps=neutral Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5C84D68B30 for ; Tue, 22 Apr 2025 23:59:36 +0200 (CEST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c1ef4acf2so3680184f8f.0 for ; Tue, 22 Apr 2025 14:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745359175; x=1745963975; 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=NoLLyeMcYw0WZHw+CBw8JHWe/oH++8f3vXYrkMExzgM=; b=wDRew07JdnZV2xaQZXYm0IINk4gR3Sz1PWlp6CjEEl8CSC7bd+vF95bb8LNKOOY3SH VADRN4/gQy5uhPZrhC6AyMsBl370fwvnWw4ZCAt+OCEqHqJwYL60YpAQi9Br/2/rx5A6 7syZnu3Ysz/8vthHwLHX1gyKo/hTYaEqGgstX9oTOjbx6LtxIqqPWzz/Lcs8ad4I4OJd XOSRgGDaIx5lbiKB4w3UXHl0zy937RP5qRcO6PFXg1hpBGYqPHLyWu1XBRunTkcdrwBg bPiV05eghYPrH7nkyTQPjYSR3sqjedPDop36cHq1n87Xn8d3gFe3fcbVLG01kUdvQ15I R9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745359175; x=1745963975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NoLLyeMcYw0WZHw+CBw8JHWe/oH++8f3vXYrkMExzgM=; b=FE8MFmKKfy2oNE6eGfql9BagvtIfiSuSlwArhiSoAkXO4eoWJB6J5InQm40pG2TREI SnFaxMlJaWacPpuHs4mzONmDKpgmPHo95MTjZ+gVgs/zRlf3TrH/evKnCqLXuxFI+tO4 VdcQ9zBCMz5lLpdJbNUpMBhRDpv+m3a+uyThZdT6oacBzWfTboj2P6mOBjfn9mXGIa1q CpEmTzGab02ebM6FxC7fieQ153nyRkUxfxdjjudgxs1EEfbkCZQxz2WfLux9T2q2AaZY pkH2RW6DhobHL5PmKcMaO8/gScU+HW/qq3SBI4xehjPRuaFgRq72c+ljCI3w3HDHCSPY HdqQ== X-Gm-Message-State: AOJu0Yy0IUu3OXEt0k5VcxAAt4Mv2rRyZZpJTWnXzoxPTTKPfCp+qQWI EvHEOK/liUeE3FqUl5/fVqYSyfb49XkaCVMttETSGGpHKXqJs8WonsLWb+/kD9p4uKLyexjtv2W MW1E= X-Gm-Gg: ASbGncvbL2/FopSa74uqz0t2jh1YATf6kuo6Xa13Ahc5Xd7fJ+Uik5gmojWB7H07XPo g2YwtcgOJKKmtGn4ULK+BLJPP20+MjERDasXSkVeWSo4w0TVUYyFp9/vhmP8LNW3IzsY1F701iZ mSR/TnjhrFZ6JhAlxlUOwATqN+UjVsq6vetg2mSPANn5e75I2mCMVMH+Y1F8jF1/NnPI852xzNu 35q5F8Z9HLh9rzG0zQM81LMxJpoveEDW6V/lDFTE+2/Tt7AFhs2K9w6QI9rkwmx1WsBVhCgmCtd Oxp4MZuPhnTUVaPWB+hqEnXtmxeuvXJ4hiUMUrhtLoWWg71Cwk1ZfCGH6pDKv/4DMUfC4pIryTW jT9TNINsUjOTKxics7Y6WTRXs+Cm2V2Y= X-Google-Smtp-Source: AGHT+IG8XChv8dt+ee21hrbNGl8xt2CF5TIozgTXTi/ysEcKfhiuZjU6Tm79O9RVY8LPTY3l7PQoZQ== X-Received: by 2002:a5d:598b:0:b0:390:e8d4:6517 with SMTP id ffacd0b85a97d-39efba3d0e2mr14041727f8f.21.1745359175462; Tue, 22 Apr 2025 14:59:35 -0700 (PDT) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-44092d2eccesm2726615e9.20.2025.04.22.14.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 14:59:34 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org, bod.linux@nxsw.ie Subject: [PATCH 13/27] libcamera: software_isp: gbm: Add in a GBM helper class for GPU surface access Date: Tue, 22 Apr 2025 22:59:06 +0100 Message-ID: <20250422215920.4297-14-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422215920.4297-1-bryan.odonoghue@linaro.org> References: <20250422215920.4297-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 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 --- src/libcamera/software_isp/gbm.cpp | 136 +++++++++++++++++++++++++++++ src/libcamera/software_isp/gbm.h | 52 +++++++++++ 2 files changed, 188 insertions(+) create mode 100644 src/libcamera/software_isp/gbm.cpp create mode 100644 src/libcamera/software_isp/gbm.h diff --git a/src/libcamera/software_isp/gbm.cpp b/src/libcamera/software_isp/gbm.cpp new file mode 100644 index 00000000..1be00f1f --- /dev/null +++ b/src/libcamera/software_isp/gbm.cpp @@ -0,0 +1,136 @@ +/* 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 +#include + +#include +#include +#include +#include + +#include "gbm.h" + +namespace libcamera { + +LOG_DEFINE_CATEGORY(GBM) + +GBM::GBM() { + fd_ = 0; +}; + +GBM::~GBM() { + if (gbm_surface_) + gbm_surface_destroy(gbm_surface_); + + if (gbm_device_) + gbm_device_destroy(gbm_device_); + + if (fd_ >= 0) + close(fd_); +}; + +// this should probably go into its own class to deal with the +// allocation and deletion of frambuffers attached to GBM devices/objects +int GBM::initSurface(uint32_t width, uint32_t height) +{ + const char *dri_node = "/dev/dri/renderD128"; //TODO: get from an env or config setting + + fd_ = open(dri_node, O_RDWR | O_CLOEXEC); //TODO: 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; + } + + // GBM_FORMAT_RGBA8888 is not supported mesa::src/gbm/dri/gbm_dri.c::gbm_dri_visuals_table[] + // This means we need to choose XRGB8888 or ARGB8888 as the raw buffer format + gbm_surface_ = gbm_surface_create(gbm_device_, width, height, GBM_FORMAT_ARGB8888, + GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR); + if (!gbm_surface_) { + LOG(GBM, Error) << "Unable to create linear gbm surface"; + goto fail; + } + + format = libcamera::formats::ARGB8888; + + return 0; +fail: + return -ENODEV; + +} + +int GBM::mapSurface() +{ + gbm_bo_ = gbm_surface_lock_front_buffer(gbm_surface_); + if (!gbm_bo_) { + LOG(GBM, Error) << "GBM input buffer object create fail"; + return -ENODEV; + } + gbm_surface_release_buffer(gbm_surface_, gbm_bo_); + + bo_fd_ = gbm_bo_get_fd(gbm_bo_); + + if (!bo_fd_) { + gbm_surface_release_buffer(gbm_surface_, gbm_bo_); + LOG(GBM, Error) << "Unable to get fd for bo: " << bo_fd_; + return -ENODEV; + } + + stride_ = gbm_bo_get_stride(gbm_bo_); + width_ = gbm_bo_get_width(gbm_bo_); + height_ = gbm_bo_get_height(gbm_bo_); + offset_ = gbm_bo_get_offset(gbm_bo_, 0); + framesize_ = height_ * stride_; + + map_ = mmap(NULL, height_ * stride_, PROT_READ, MAP_SHARED, bo_fd_, 0); + if (map_ == MAP_FAILED) { + LOG(GBM, Error) << "mmap gbm_bo_ fail"; + return -ENODEV; + } + + LOG(GBM, Debug) << " stride " << stride_ + << " width " << width_ + << " height " << height_ + << " offset " << offset_ + << " framesize " << framesize_; + + return 0; +} + +int GBM::getFrameBufferData(uint8_t *data, size_t data_len) +{ + struct dma_buf_sync sync; + + gbm_surface_lock_front_buffer(gbm_surface_); + + sync.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_READ; + ioctl(bo_fd_, DMA_BUF_IOCTL_SYNC, &sync); + + if (data_len > framesize_) { + LOG(GBM, Error) << "Invalid read size " << data_len << " max is " << framesize_; + return -EINVAL; + } + + memcpy(data, map_, data_len); + + sync.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_READ; + ioctl(bo_fd_, DMA_BUF_IOCTL_SYNC, &sync); + + gbm_surface_release_buffer(gbm_surface_, gbm_bo_); + + return 0; +} +}; //namespace libcamera diff --git a/src/libcamera/software_isp/gbm.h b/src/libcamera/software_isp/gbm.h new file mode 100644 index 00000000..9ccfb1ba --- /dev/null +++ b/src/libcamera/software_isp/gbm.h @@ -0,0 +1,52 @@ +/* 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 initSurface(uint32_t width, uint32_t height); + int mapSurface(); + int getFrameBufferData(uint8_t *data_out, size_t data_len); + struct gbm_device *getDevice() { return gbm_device_; }; + struct gbm_surface *getSurface() { return gbm_surface_; }; + uint32_t getFrameSize() { return framesize_; }; + uint32_t getStride() { return stride_; }; + + PixelFormat format; + +private: + int fd_; + struct gbm_device *gbm_device_; + struct gbm_surface *gbm_surface_; + + struct gbm_bo *gbm_bo_; + uint32_t width_; + uint32_t height_; + uint32_t stride_; + uint32_t offset_; + uint32_t framesize_; + void *map_; + int bo_fd_; +}; + +};