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