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

cam: drm: Skip DRM devices not capable of mode setting

Browse source 
The DRM helper picks the first DRM card that it can open. On platforms
that have a standalone GPU, this risks selecting a device corresponding
to the GPU instead of the display controller. Fix this by skipping
devices that don't support the KMS mode setting API. Some legacy display
controllers would be skipped as well, but libcamera doesn't run on those
systems anyway.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2022-09-28 02:18:37 +03:00
parent 2f1efe50a9
commit aafad4d0ca
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/cam/drm.cpp
View file

@ -430,7 +430,8 @@ int Device::init()
int Device::openCard() int Device::openCard()
{ {
const std::string dirName = "/dev/dri/"; const std::string dirName = "/dev/dri/";
int ret = -ENOENT; bool found = false;
int ret;
/* /*
* Open the first DRM/KMS device beginning with /dev/dri/card. The * Open the first DRM/KMS device beginning with /dev/dri/card. The
@ -449,24 +450,42 @@ 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;
const std::string devName = dirName + res->d_name; const std::string devName = dirName + res->d_name;
fd_ = open(devName.c_str(), O_RDWR | O_CLOEXEC); fd_ = open(devName.c_str(), O_RDWR | O_CLOEXEC);
if (fd_ >= 0) { if (fd_ < 0) {
ret = 0; ret = -errno;
break; std::cerr << "Failed to open DRM/KMS device " << devName << ": "
<< strerror(-ret) << std::endl;
continue;
} }
ret = -errno; /*
std::cerr << "Failed to open DRM/KMS device " << devName << ": " * Skip devices that don't support the modeset API, to avoid
<< strerror(-ret) << std::endl; * selecting a DRM device corresponding to a GPU. There is no
* modeset capability, but the kernel returns an error for most
* caps if mode setting isn't support by the driver. The
* DRM_CAP_DUMB_BUFFER capability is one of those, other would
* do as well. The capability value itself isn't relevant.
*/
ret = drmGetCap(fd_, DRM_CAP_DUMB_BUFFER, &cap);
if (ret < 0) {
drmClose(fd_);
fd_ = -1;
continue;
}
found = true;
break;
} }
closedir(folder); closedir(folder);
return ret; return found ? 0 : -ENOENT;
} }
int Device::getResources() int Device::getResources()