summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2022-03-02 16:31:24 -0500
committerRay Strode <halfline@gmail.com>2022-03-23 14:21:09 +0000
commit280ce4fe1b58057958f312efa429d47faf556e94 (patch)
treecbea63e0ce11739fb985fd9ab80786048570f58a /data
parent55f5724789f9f8e85af310c69d8f7096b8e730e8 (diff)
downloadgdm-280ce4fe1b58057958f312efa429d47faf556e94.tar.gz
data: Be a little more specific when matching PCI cards
udev sends a variety of events about devices during boot. Right now we may be disabling wayland multiple times on Hi1710 ARM machines, because we just match the device by id, and fail to look at the event itself. This commit just adds subsystem and action guards to specify when the wayland disabling code should run a little more specifically.
Diffstat (limited to 'data')
-rw-r--r--data/61-gdm.rules.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index e9c72697..0f6e4466 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -1,6 +1,12 @@
+
+SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
+ACTION!="bind", GOTO="gdm_pci_device_end"
+
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
+LABEL="gdm_pci_device_end"
+
# disable Wayland if modesetting is disabled
KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end"
SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"