From afbdf4261a858e6ad2b41fd6bccec704690b2dd112554d12e1435dd6f86e6e69 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 2 Nov 2022 15:36:11 +0000 Subject: [PATCH] Accepting request 1032916 from home:tdz:branches:X11:XOrg - u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch * Add workaround to support ofdrm OBS-URL: https://build.opensuse.org/request/show/1032916 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=835 --- ...evices-with-the-kernels-ofdrm-driver.patch | 31 +++++++++++++++++++ xorg-x11-server.changes | 6 ++++ xorg-x11-server.spec | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch diff --git a/u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch b/u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch new file mode 100644 index 0000000..4131140 --- /dev/null +++ b/u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch @@ -0,0 +1,31 @@ +From a7029faa7da778f9bab88d417e85041c631c87e6 Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Wed, 18 May 2022 10:44:06 +0200 +Subject: [PATCH] xf86: Accept devices with the kernels ofdrm driver + +Add a workaround to accept devices of the kernel's ofdrm driver. +Makes Xorg work on Open Firmware's pre-configured display with the +DRM graphics stack. + +Signed-off-by: Thomas Zimmermann +--- + hw/xfree86/common/xf86platformBus.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index 071f44b2a..6a0c3177b 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -563,6 +563,9 @@ xf86platformProbeDev(DriverPtr drvp) + /* Accept the device if the driver is hyperv_drm */ + if (strcmp(xf86_platform_devices[j].attribs->driver, "hyperv_drm") == 0) + break; ++ /* Accept the device if the driver is ofdrm */ ++ if (strcmp(xf86_platform_devices[j].attribs->driver, "ofdrm") == 0) ++ break; + /* Accept the device if the driver is simpledrm */ + if (strcmp(xf86_platform_devices[j].attribs->driver, "simpledrm") == 0) + break; +-- +2.38.0 + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index ec0305e..401f1b1 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 2 12:29:59 UTC 2022 - Thomas Zimmermann + +- u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch + * Add workaround to support ofdrm + ------------------------------------------------------------------- Wed Oct 19 11:06:46 UTC 2022 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f3b9ed2..d229cbd 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -240,6 +240,7 @@ Patch1900: u_no-lto-for-tests.patch Patch1910: u_modesetting-Fix-dirty-updates-for-sw-rotation.patch Patch1920: u_xf86-Accept-devices-with-the-hyperv_drm-driver.patch +Patch1921: u_xf86-Accept-devices-with-the-kernels-ofdrm-driver.patch Patch1930: u_xfree86-activate-GPU-screens-on-autobind.patch @@ -404,6 +405,7 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch1900 -p1 %patch1910 -p1 %patch1920 -p1 +%patch1921 -p1 %patch1930 -p1 %patch1940 -p1 %patch1960 -p1