diff --git a/u_Refuse-to-run-on-machines-with-simpledrmfb-too.patch b/u_Refuse-to-run-on-machines-with-simpledrmfb-too.patch new file mode 100644 index 0000000..8c079c4 --- /dev/null +++ b/u_Refuse-to-run-on-machines-with-simpledrmfb-too.patch @@ -0,0 +1,32 @@ +From 05aa4057d9369165f4f49b5dcc9064b4bfdfe9e5 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 10 Mar 2022 08:22:21 +0100 +Subject: [PATCH] Refuse to run on machines with simpledrmfb, too +References: bsc#1193539 + +simpledrm framebuffer takes over EFI and manages the graphics. +Running vesa driver on those would confuse the system and result in a +bad interaction. +Just bail out like efifb and other cases. + +Signed-off-by: Takashi Iwai + +--- + src/vesa.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/vesa.c b/src/vesa.c +index b2a1922c2332..53c3d47547c7 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -453,6 +453,7 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + + #ifdef __linux__ + if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0 || ++ access("/sys/devices/platform/simple-framebuffer.0", F_OK) == 0 || + access("/sys/devices/platform/efifb.0", F_OK) == 0) { + ErrorF("vesa: Refusing to run on UEFI\n"); + return FALSE; +-- +2.31.1 + diff --git a/xf86-video-vesa.changes b/xf86-video-vesa.changes index a0d465e..0739d54 100644 --- a/xf86-video-vesa.changes +++ b/xf86-video-vesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 10 08:26:25 CET 2022 - tiwai@suse.de + +- Refuse vesa driver on the system with simpledrmfb (bsc#1193539): + u_Refuse-to-run-on-machines-with-simpledrmfb-too.patch + ------------------------------------------------------------------- Tue Apr 6 02:07:18 UTC 2021 - Dirk Müller diff --git a/xf86-video-vesa.spec b/xf86-video-vesa.spec index 2fbbd02..48abadf 100644 --- a/xf86-video-vesa.spec +++ b/xf86-video-vesa.spec @@ -1,7 +1,7 @@ # # spec file for package xf86-video-vesa # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Source2: %{name}.keyring Patch1: u_Restore-palette-on-LeaveVT.patch Patch2: u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch Patch3: u_DPMS-Check-for-broken-DPMSGet.patch +Patch4: u_Refuse-to-run-on-machines-with-simpledrmfb-too.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.10 @@ -57,6 +58,7 @@ supports depths 8, 15 16 and 24. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure