NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

apps: cam: Skip non-display GPUs

Browse source 
Device::openCard() in the cam DRM helpers looks for a /dev/dri/card*
device that can be opened and that doesn't fail when asked about
DRM_CAP_DUMB_BUFFER capability (regardless whether the capability is
supported by the device).

There can be matching devices that are not display devices.  This can
lead to selection of such a device and inability to use KMS output with
the `cam' application.  The ultimate goal is to display something on the
device and later the KMS sink will fail if there is no connector
attached to the device (although it can actually fail earlier, when
trying to set DRM_CLIENT_CAP_ATOMIC capability if this is not
supported).

Let's avoid selecting devices without connectors, CRTCs or encoders.
The added check makes the original check for DRM_CAP_DUMB_BUFFER API
most likely unnecessary, let's remove it.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Milan Zamazal 2025-05-30 11:08:15 +02:00 • committed by Laurent Pinchart
parent 1ee330c058
commit 663ab2ee8e
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/apps/cam/drm.cpp
View file

@ -450,8 +450,6 @@ int Device::openCard()
} }
for (struct dirent *res; (res = readdir(folder));) { for (struct dirent *res; (res = readdir(folder));) {
uint64_t cap;
if (strncmp(res->d_name, "card", 4)) if (strncmp(res->d_name, "card", 4))
continue; continue;
@ -465,15 +463,22 @@ int Device::openCard()
} }
/* /*
* Skip devices that don't support the modeset API, to avoid * Skip non-display devices. While this could in theory be done
* selecting a DRM device corresponding to a GPU. There is no * by checking for support of the mode setting API, some
* modeset capability, but the kernel returns an error for most * out-of-tree render-only GPU drivers (namely powervr)
* caps if mode setting isn't support by the driver. The * incorrectly set the DRIVER_MODESET driver feature. Check for
* DRM_CAP_DUMB_BUFFER capability is one of those, other would * the presence of at least one CRTC, encoder and connector
* do as well. The capability value itself isn't relevant. * instead.
*/ */
ret = drmGetCap(fd_, DRM_CAP_DUMB_BUFFER, &cap); std::unique_ptr<drmModeRes, decltype(&drmModeFreeResources)> resources{
if (ret < 0) { drmModeGetResources(fd_),
&drmModeFreeResources
};
if (!resources ||
resources->count_connectors <= 0 ||
resources->count_crtcs <= 0 ||
resources->count_encoders <= 0) {
resources.reset();
drmClose(fd_); drmClose(fd_);
fd_ = -1; fd_ = -1;
continue; continue;