75652ad9d3
I have better fix planned but unfortunately I won't get it to work before Plasma 5.13.2 release (Plasma 5.13.1 is due today). Fixes #1574
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From bf01478615db30fe1357b2e54ec6b345d6acd196 Mon Sep 17 00:00:00 2001
|
|
From: Bhushan Shah <bhush94@gmail.com>
|
|
Date: Tue, 19 Jun 2018 08:26:46 +0530
|
|
Subject: [PATCH] Revert "udev: Only handle devices from the current seat"
|
|
|
|
This reverts commit 99376d38f69f6bcc13d7a8ebdb679b7c18e30586.
|
|
---
|
|
udev.cpp | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/udev.cpp b/udev.cpp
|
|
index f064b089b..e3b2406c3 100644
|
|
--- a/udev.cpp
|
|
+++ b/udev.cpp
|
|
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "udev.h"
|
|
-#include "logind.h"
|
|
// Qt
|
|
#include <QByteArray>
|
|
#include <QScopedPointer>
|
|
@@ -107,7 +106,6 @@ UdevDevice::Ptr UdevEnumerate::find(std::function<bool(const UdevDevice::Ptr &de
|
|
if (m_enumerate.isNull()) {
|
|
return UdevDevice::Ptr();
|
|
}
|
|
- QString defaultSeat = QStringLiteral("seat0");
|
|
udev_list_entry *it = udev_enumerate_get_list_entry(m_enumerate.data());
|
|
UdevDevice::Ptr firstFound;
|
|
while (it) {
|
|
@@ -117,13 +115,6 @@ UdevDevice::Ptr UdevEnumerate::find(std::function<bool(const UdevDevice::Ptr &de
|
|
if (!device) {
|
|
continue;
|
|
}
|
|
- QString deviceSeat = device->property("ID_SEAT");
|
|
- if (deviceSeat.isEmpty()) {
|
|
- deviceSeat = defaultSeat;
|
|
- }
|
|
- if (deviceSeat != LogindIntegration::self()->seat()) {
|
|
- continue;
|
|
- }
|
|
if (test(device)) {
|
|
return device;
|
|
}
|
|
@@ -144,6 +135,7 @@ UdevDevice::Ptr Udev::primaryGpu()
|
|
enumerate.addMatch(UdevEnumerate::Match::SysName, "card[0-9]*");
|
|
enumerate.scan();
|
|
return enumerate.find([](const UdevDevice::Ptr &device) {
|
|
+ // TODO: check seat
|
|
auto pci = device->getParentWithSubsystemDevType("pci");
|
|
if (!pci) {
|
|
return false;
|
|
--
|
|
2.17.1
|
|
|