hypr
/
aquamarine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert debugging

This commit is contained in:
Samuel Cobb 2024-07-25 23:23:09 +01:00
parent a8a13eb88a
commit 473bee3259
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -48,11 +48,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721743106, "lastModified": 1721138476,
"narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
src/backend/Backend.cpp
View File

@ -276,18 +276,7 @@ int Aquamarine::CBackend::reopenDRMNode(int drmFD, bool allowRenderNode) {
// Only recent kernels support empty leases // Only recent kernels support empty leases
uint32_t lesseeID = 0; uint32_t lesseeID = 0;
int leaseFD = drmModeCreateLease(drmFD, nullptr, 0, O_CLOEXEC, &lesseeID); int leaseFD = drmModeCreateLease(drmFD, nullptr, 0, O_CLOEXEC, &lesseeID);
log(AQ_LOG_TRACE, std::format("lesseeID: {}, leaseFD: {}", lesseeID, leaseFD));
if (leaseFD >= 0) { if (leaseFD >= 0) {
log(AQ_LOG_TRACE, std::format("leaseFD Passed: {}", leaseFD));
char* name = nullptr;
if (allowRenderNode)
name = drmGetRenderDeviceNameFromFd(leaseFD);
if(name) {
log(AQ_LOG_TRACE, std::format("Render device has name inside drmIsMaster: {}", name));
}
free(name);
return leaseFD; return leaseFD;
} else if (leaseFD != -EINVAL && leaseFD != -EOPNOTSUPP) { } else if (leaseFD != -EINVAL && leaseFD != -EOPNOTSUPP) {
log(AQ_LOG_ERROR, "reopenDRMNode: drmModeCreateLease failed"); log(AQ_LOG_ERROR, "reopenDRMNode: drmModeCreateLease failed");