From 1e08709fc485a0f89e7bd6cb484863765853f96dd38aac3ea1e8b8f021f914a4 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 21 Jul 2020 16:23:30 +0000 Subject: [PATCH] Accepting request 822132 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20200709+ab986a9: main: Don't bail out of load_settings if Theme is missing; main: switch log file when switching mode; two-step: Center message text within labels if labels are centered; Add CI pipeline for Plymouth; Apply suggestion to .gitlab-ci.yml; configure: bump to 0.9.6; configure: quiet a warning; po: drop intltool usage; docs: fix man page cross-reference; Rename 'percent_done' to 'fraction_done' OBS-URL: https://build.opensuse.org/request/show/822132 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=265 --- plymouth-only_use_fb_for_cirrus_bochs.patch | 47 --------------------- 1 file changed, 47 deletions(-) delete mode 100644 plymouth-only_use_fb_for_cirrus_bochs.patch diff --git a/plymouth-only_use_fb_for_cirrus_bochs.patch b/plymouth-only_use_fb_for_cirrus_bochs.patch deleted file mode 100644 index b535cbc..0000000 --- a/plymouth-only_use_fb_for_cirrus_bochs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Fabian Vogt -Subject: force fb for cirrus and bochs, force drm otherwise -References: bsc#888590, bsc#980750 - -DRM does not work well with cirrus and bochs (no display) but the framebuffer driver -prevents DRM drivers from loading. -As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remove support for frame-buffer. - -Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-core/ply-device-manager.c 2018-08-07 17:41:15.000000000 +0200 -+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c 2018-08-17 19:58:41.178821647 +0200 -@@ -228,13 +228,33 @@ create_devices_for_udev_device (ply_devi - subsystem = udev_device_get_subsystem (device); - ply_trace ("device subsystem is %s", subsystem); - -+ const char *card_vendor = udev_device_get_sysattr_value (device, "device/vendor"); -+ const char *card_device = udev_device_get_sysattr_value (device, "device/device"); -+ bool use_fb = false; -+ if (card_vendor) { -+ /* Cirrus */ -+ if (strcmp ("0x1013", card_vendor) == 0) -+ use_fb = true; -+ /* "Technical Corp", also used by bochs */ -+ else if (strcmp ("0x1234", card_vendor) == 0) -+ use_fb = strcmp("0x1111", card_device) == 0; -+ } -+ - if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) { - ply_trace ("found DRM device %s", device_path); - renderer_type = PLY_RENDERER_TYPE_DRM; -+ if (use_fb) { -+ ply_trace ("forcing use of framebuffer for cirrusdrmfb"); -+ renderer_type = PLY_RENDERER_TYPE_NONE; -+ } - } else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) { - ply_trace ("found frame buffer device %s", device_path); -- if (!fb_device_has_drm_device (manager, device)) -+ if (use_fb) { - renderer_type = PLY_RENDERER_TYPE_FRAME_BUFFER; -+ } -+ else if (!fb_device_has_drm_device (manager, device)) { -+ ply_trace ("avoiding use of framebuffer to not block DRM drivers from working"); -+ } - else - ply_trace ("ignoring, since there's a DRM device associated with it"); - }