- Modify plymouth-ignore-cirrusdrm.patch to return as

early as possible. Patch by glin@suse.com

OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=153
This commit is contained in:
Ismail Dönmez 2014-08-11 14:31:21 +00:00 committed by Git OBS Bridge
parent cf2a476bc8
commit 87904dbf16
2 changed files with 21 additions and 21 deletions

View File

@ -1,21 +1,15 @@
Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
=================================================================== index a5aa59d..0be2117 100644
--- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c --- a/src/libply-splash-core/ply-device-manager.c
+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c
@@ -149,8 +149,14 @@ fb_device_has_drm_device (ply_device_man @@ -125,6 +125,10 @@ fb_device_has_drm_device (ply_device_manager_t *manager,
card_path = udev_list_entry_get_name (card_entry); const char *id_path;
card_device = udev_device_new_from_syspath (manager->udev_context, card_path); bool has_drm_device = false;
card_node = udev_device_get_devnode (card_device);
- if (card_node != NULL) + const char *card_name = udev_device_get_sysattr_value (fb_device, "name");
- has_drm_device = true; + if (card_name && strcmp ("cirrusdrmfb", card_name) == 0)
+ if (card_node != NULL) { + return false;
+ /* don't consider drm driver for cirrus usable */ +
+ const char *card_name = udev_device_get_sysattr_value (card_device, "name"); /* We want to see if the framebuffer is associated with a DRM-capable
+ if (card_name && strcmp ("cirrusdrmfb", card_name) == 0) * graphics card, if it is, we'll use the DRM device */
+ has_drm_device = false; card_matches = udev_enumerate_new (manager->udev_context);
+ else
+ has_drm_device = true;
+ }
else
ply_trace ("no card node!");

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 11 14:23:27 UTC 2014 - idonmez@suse.com
- Modify plymouth-ignore-cirrusdrm.patch to return as
early as possible. Patch by glin@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 7 09:24:37 UTC 2014 - idonmez@suse.com Thu Aug 7 09:24:37 UTC 2014 - idonmez@suse.com