PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: internal: Move dma_heaps.[h, cpp] to common directories

Browse Source 
DmaHeap class is useful outside the RPi pipeline handler too.

Move dma_heaps.h and dma_heaps.cpp to common directories. Update
the build files and RPi vc4 pipeline handler accordingly.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s
Tested-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Andrey Konovalov
2024-04-16 11:13:38 +02:00
committed by Kieran Bingham
parent d89b15a612
commit 6062ada2f5
7 changed files with 128 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcamera/pipeline/rpi/vc4/dma_heaps.h → include/libcamera/internal/dma_heaps.h
View File

@@ -13,8 +13,6 @@
namespace libcamera {
namespace RPi {
class DmaHeap
{
public:
@@ -27,6 +25,4 @@ private:
UniqueFD dmaHeapHandle_;
};
} /* namespace RPi */
} /* namespace libcamera */

1
include/libcamera/internal/meson.build
View File

@@ -25,6 +25,7 @@ libcamera_internal_headers = files([
'device_enumerator.h',
'device_enumerator_sysfs.h',
'device_enumerator_udev.h',
'dma_heaps.h',
'formats.h',
'framebuffer.h',
'ipa_manager.h',

124
src/libcamera/dma_heaps.cpp Normal file
View File

@@ -0,0 +1,124 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2020, Raspberry Pi Ltd
*
* dma_heaps.cpp - Helper class for dma-heap allocations.
*/
#include "libcamera/internal/dma_heaps.h"
#include <array>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <linux/dma-buf.h>
#include <linux/dma-heap.h>
#include <libcamera/base/log.h>
/**
* \file dma_heaps.cpp
* \brief CMA dma-heap allocator
*/
/*
* /dev/dma_heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma
* to only have to worry about importing.
*
* Annoyingly, should the cma heap size be specified on the kernel command line
* instead of DT, the heap gets named "reserved" instead.
*/
static constexpr std::array<const char *, 2> heapNames = {
"/dev/dma_heap/linux,cma",
"/dev/dma_heap/reserved"
};
namespace libcamera {
LOG_DEFINE_CATEGORY(DmaHeap)
/**
* \class DmaHeap
* \brief Helper class for CMA dma-heap allocations
*/
/**
* \brief Construct a DmaHeap that owns a CMA dma-heap file descriptor
*
* Looks for a CMA dma-heap device to use. If it fails to open any dma-heap
* device, an invalid DmaHeap object is constructed.
*
* Check the new DmaHeap object with isValid before using it.
*/
DmaHeap::DmaHeap()
{
for (const char *name : heapNames) {
int ret = ::open(name, O_RDWR | O_CLOEXEC, 0);
if (ret < 0) {
ret = errno;
LOG(DmaHeap, Debug)
<< "Failed to open " << name << ": "
<< strerror(ret);
continue;
}
dmaHeapHandle_ = UniqueFD(ret);
break;
}
if (!dmaHeapHandle_.isValid())
LOG(DmaHeap, Error) << "Could not open any dmaHeap device";
}
/**
* \brief Destroy the DmaHeap instance
*/
DmaHeap::~DmaHeap() = default;
/**
* \fn DmaHeap::isValid()
* \brief Check if the DmaHeap instance is valid
* \return True if the DmaHeap is valid, false otherwise
*/
/**
* \brief Allocate a dma-buf from the DmaHeap
* \param [in] name The name to set for the allocated buffer
* \param [in] size The size of the buffer to allocate
*
* Allocates a dma-buf with read/write access.
*
* If the allocation fails, return an invalid UniqueFD.
*
* \return The UniqueFD of the allocated buffer
*/
UniqueFD DmaHeap::alloc(const char *name, std::size_t size)
{
int ret;
if (!name)
return {};
struct dma_heap_allocation_data alloc = {};
alloc.len = size;
alloc.fd_flags = O_CLOEXEC | O_RDWR;
ret = ::ioctl(dmaHeapHandle_.get(), DMA_HEAP_IOCTL_ALLOC, &alloc);
if (ret < 0) {
LOG(DmaHeap, Error) << "dmaHeap allocation failure for " << name;
return {};
}
UniqueFD allocFd(alloc.fd);
ret = ::ioctl(allocFd.get(), DMA_BUF_SET_NAME, name);
if (ret < 0) {
LOG(DmaHeap, Error) << "dmaHeap naming failure for " << name;
return {};
}
return allocFd;
}
} /* namespace libcamera */

1
src/libcamera/meson.build
View File

@@ -15,6 +15,7 @@ libcamera_sources = files([
'delayed_controls.cpp',
'device_enumerator.cpp',
'device_enumerator_sysfs.cpp',
'dma_heaps.cpp',
'fence.cpp',
'formats.cpp',
'framebuffer.cpp',

90
src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp
View File

@@ -1,90 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2020, Raspberry Pi Ltd
*
* dma_heaps.h - Helper class for dma-heap allocations.
*/
#include "dma_heaps.h"
#include <array>
#include <fcntl.h>
#include <linux/dma-buf.h>
#include <linux/dma-heap.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <libcamera/base/log.h>
/*
* /dev/dma-heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma
* to only have to worry about importing.
*
* Annoyingly, should the cma heap size be specified on the kernel command line
* instead of DT, the heap gets named "reserved" instead.
*/
static constexpr std::array<const char *, 2> heapNames = {
"/dev/dma_heap/linux,cma",
"/dev/dma_heap/reserved"
};
namespace libcamera {
LOG_DECLARE_CATEGORY(RPI)
namespace RPi {
DmaHeap::DmaHeap()
{
for (const char *name : heapNames) {
int ret = ::open(name, O_RDWR | O_CLOEXEC, 0);
if (ret < 0) {
ret = errno;
LOG(RPI, Debug) << "Failed to open " << name << ": "
<< strerror(ret);
continue;
}
dmaHeapHandle_ = UniqueFD(ret);
break;
}
if (!dmaHeapHandle_.isValid())
LOG(RPI, Error) << "Could not open any dmaHeap device";
}
DmaHeap::~DmaHeap() = default;
UniqueFD DmaHeap::alloc(const char *name, std::size_t size)
{
int ret;
if (!name)
return {};
struct dma_heap_allocation_data alloc = {};
alloc.len = size;
alloc.fd_flags = O_CLOEXEC | O_RDWR;
ret = ::ioctl(dmaHeapHandle_.get(), DMA_HEAP_IOCTL_ALLOC, &alloc);
if (ret < 0) {
LOG(RPI, Error) << "dmaHeap allocation failure for "
<< name;
return {};
}
UniqueFD allocFd(alloc.fd);
ret = ::ioctl(allocFd.get(), DMA_BUF_SET_NAME, name);
if (ret < 0) {
LOG(RPI, Error) << "dmaHeap naming failure for "
<< name;
return {};
}
return allocFd;
}
} /* namespace RPi */
} /* namespace libcamera */

1
src/libcamera/pipeline/rpi/vc4/meson.build
View File

@@ -1,7 +1,6 @@
# SPDX-License-Identifier: CC0-1.0
libcamera_sources += files([
'dma_heaps.cpp',
'vc4.cpp',
])

5
src/libcamera/pipeline/rpi/vc4/vc4.cpp
View File

@@ -12,12 +12,11 @@
#include <libcamera/formats.h>
#include "libcamera/internal/device_enumerator.h"
#include "libcamera/internal/dma_heaps.h"
#include "../common/pipeline_base.h"
#include "../common/rpi_stream.h"
#include "dma_heaps.h"
using namespace std::chrono_literals;
namespace libcamera {
@@ -87,7 +86,7 @@ public:
RPi::Device<Isp, 4> isp_;
/* DMAHEAP allocation helper. */
RPi::DmaHeap dmaHeap_;
DmaHeap dmaHeap_;
SharedFD lsTable_;
struct Config {