isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

native: shore up matching of card device

Browse Source 
Right now we accept any character device that matches the glob card*.

That's fine, but we can be a little more specific by checking that
the devtype is what we expect.

This commit does that.

https://bugzilla.gnome.org/show_bug.cgi?id=771442
This commit is contained in:
Ray Strode 2016-10-19 10:41:14 -04:00
parent ef2000053a
commit f1e1a5ff06
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/native/meta-launcher.c
View File

@ -47,6 +47,8 @@
#include "meta-idle-monitor-native.h" #include "meta-idle-monitor-native.h"
#include "meta-renderer-native.h" #include "meta-renderer-native.h"
#define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
@ -310,12 +312,17 @@ get_primary_gpu_path (const gchar *seat_name)
g_autoptr (GUdevDevice) pci_device = NULL; g_autoptr (GUdevDevice) pci_device = NULL;
GUdevDevice *dev = tmp->data; GUdevDevice *dev = tmp->data;
gint boot_vga; gint boot_vga;
const gchar *device_type;
const gchar *device_seat; const gchar *device_seat;
/* filter out devices that are not character device, like card0-VGA-1 */ /* filter out devices that are not character device, like card0-VGA-1 */
if (g_udev_device_get_device_type (dev) != G_UDEV_DEVICE_TYPE_CHAR) if (g_udev_device_get_device_type (dev) != G_UDEV_DEVICE_TYPE_CHAR)
continue; continue;
device_type = g_udev_device_get_property (dev, "DEVTYPE");
if (g_strcmp0 (device_type, DRM_CARD_UDEV_DEVICE_TYPE) != 0)
continue;
device_seat = g_udev_device_get_property (dev, "ID_SEAT"); device_seat = g_udev_device_get_property (dev, "ID_SEAT");
if (!device_seat) if (!device_seat)
{ {