pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plymouth-ignore-cirrusdrm.patch
View File

@ -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);

6
plymouth.changes
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