Attachment 924552 Details for Bug 1127001 – Fedora package patch to fix the problem, take 2.

[patch] Fedora package patch to fix the problem, take 2.

0001-Allow-non-PCI-device-as-primary.patch (text/plain), 6.55 KB, created by Stephen Warren on 2014-08-06 18:05:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Warren

Created: 2014-08-06 18:05:45 UTC

Size: 6.55 KB

patch

obsolete

>From 6cbc479e84800d437020937ffddef9e648f74dd6 Mon Sep 17 00:00:00 2001
>From: Stephen Warren <swarren@nvidia.com>
>Date: Wed, 6 Aug 2014 11:54:17 -0600
>Subject: [PATCH] Allow non-PCI device as primary
>
>Without this, X won't start on NVIDIA Tegra systems, claiming
>"no screens found".
>
>---
> ...lback-to-first-platform-device-as-primary.patch | 84 ++++++++++++++++++++++
> ...-xfree86-Allow-non-PCI-devices-as-primary.patch | 43 +++++++++++
> xorg-x11-server.spec                               |  4 ++
> 3 files changed, 131 insertions(+)
> create mode 100644 0001-xfree86-Fallback-to-first-platform-device-as-primary.patch
> create mode 100644 0002-xfree86-Allow-non-PCI-devices-as-primary.patch
>
>diff --git a/0001-xfree86-Fallback-to-first-platform-device-as-primary.patch b/0001-xfree86-Fallback-to-first-platform-device-as-primary.patch
>new file mode 100644
>index 0000000..a6139f2
>--- /dev/null
>+++ b/0001-xfree86-Fallback-to-first-platform-device-as-primary.patch
>@@ -0,0 +1,84 @@
>+From patchwork Wed Jun 25 13:49:45 2014
>+Content-Type: text/plain; charset="utf-8"
>+MIME-Version: 1.0
>+Content-Transfer-Encoding: 7bit
>+Subject: [1/2] xfree86: Fallback to first platform device as primary
>+From: Thierry Reding <thierry.reding@gmail.com>
>+X-Patchwork-Id: 28494
>+Message-Id: <1403704186-31148-2-git-send-email-thierry.reding@gmail.com>
>+To: Dave Airlie <airlied@redhat.com>, Keith Packard <keithp@keithp.com>,
>+ Rob Clark <robdclark@gmail.com>
>+Cc: Dennis Gilmore <dennis@ausil.us>, Hans de Goede <hdegoede@redhat.com>,
>+ xorg-devel@lists.x.org, David Herrmann <dh.herrmann@gmail.com>
>+Date: Wed, 25 Jun 2014 15:49:45 +0200
>+
>+From: Thierry Reding <treding@nvidia.com>
>+
>+When neither of the various bus implementations was able to find a
>+primary bus and device, fallback to using the platform bus as primary
>+bus and the first platform device as primary device.
>+
>+Signed-off-by: Thierry Reding <treding@nvidia.com>
>+Reviewed-by: Rob Clark <robdclark@gmail.com>
>+Tested-by: Rob Clark <robdclark@gmail.com>
>+Reviewed-by: Rob Clark <robdclark@gmail.com>
>+Tested-by: Rob Clark <robdclark@gmail.com>
>+
>+---
>+hw/xfree86/common/xf86Bus.c         |  3 +++
>+ hw/xfree86/common/xf86platformBus.c | 17 +++++++++++++++++
>+ hw/xfree86/common/xf86platformBus.h |  1 +
>+ 3 files changed, 21 insertions(+)
>+
>+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
>+index b3b3f8cc524b..bd3e4e37bbb3 100644
>+--- a/hw/xfree86/common/xf86Bus.c
>++++ b/hw/xfree86/common/xf86Bus.c
>+@@ -210,6 +210,9 @@ xf86BusProbe(void)
>+ #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
>+     xf86SbusProbe();
>+ #endif
>++#ifdef XSERVER_PLATFORM_BUS
>++    xf86platformPrimary();
>++#endif
>+ }
>+ 
>+ /*
>+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
>+index dd118a28565b..467b26b1de1a 100644
>+--- a/hw/xfree86/common/xf86platformBus.c
>++++ b/hw/xfree86/common/xf86platformBus.c
>+@@ -560,4 +560,21 @@ void xf86platformVTProbe(void)
>+         xf86PlatformReprobeDevice(i, xf86_platform_devices[i].attribs);
>+     }
>+ }
>++
>++void xf86platformPrimary(void)
>++{
>++    /* use the first platform device as a fallback */
>++    if (primaryBus.type == BUS_NONE) {
>++        xf86Msg(X_INFO, "no primary bus or device found\n");
>++
>++        if (xf86_num_platform_devices > 0) {
>++            char *syspath = xf86_get_platform_attrib(0, ODEV_ATTRIB_SYSPATH);
>++
>++            xf86Msg(X_NONE, "\tfalling back to %s\n", syspath);
>++
>++            primaryBus.id.plat = &xf86_platform_devices[0];
>++            primaryBus.type = BUS_PLATFORM;
>++        }
>++    }
>++}
>+ #endif
>+diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
>+index 5dee4e0e029a..dec1956489fd 100644
>+--- a/hw/xfree86/common/xf86platformBus.h
>++++ b/hw/xfree86/common/xf86platformBus.h
>+@@ -77,6 +77,7 @@ extern _X_EXPORT int
>+ xf86PlatformMatchDriver(char *matches[], int nmatches);
>+ 
>+ extern void xf86platformVTProbe(void);
>++extern void xf86platformPrimary(void);
>+ #endif
>+ 
>+ #endif
>diff --git a/0002-xfree86-Allow-non-PCI-devices-as-primary.patch b/0002-xfree86-Allow-non-PCI-devices-as-primary.patch
>new file mode 100644
>index 0000000..3581bf2
>--- /dev/null
>+++ b/0002-xfree86-Allow-non-PCI-devices-as-primary.patch
>@@ -0,0 +1,43 @@
>+From patchwork Wed Jun 25 13:49:46 2014
>+Content-Type: text/plain; charset="utf-8"
>+MIME-Version: 1.0
>+Content-Transfer-Encoding: 7bit
>+Subject: [2/2] xfree86: Allow non-PCI devices as primary
>+From: Thierry Reding <thierry.reding@gmail.com>
>+X-Patchwork-Id: 28495
>+Message-Id: <1403704186-31148-3-git-send-email-thierry.reding@gmail.com>
>+To: Dave Airlie <airlied@redhat.com>, Keith Packard <keithp@keithp.com>,
>+ Rob Clark <robdclark@gmail.com>
>+Cc: Dennis Gilmore <dennis@ausil.us>, Hans de Goede <hdegoede@redhat.com>,
>+ xorg-devel@lists.x.org, David Herrmann <dh.herrmann@gmail.com>
>+Date: Wed, 25 Jun 2014 15:49:46 +0200
>+
>+From: Thierry Reding <treding@nvidia.com>
>+
>+On platforms that don't support PCI or have no GPU attached to the PCI
>+bus, there can still be a primary device on a non-PCI bus.
>+
>+Signed-off-by: Thierry Reding <treding@nvidia.com>
>+
>+---
>+hw/xfree86/common/xf86platformBus.c | 7 +++----
>+ 1 file changed, 3 insertions(+), 4 deletions(-)
>+
>+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
>+index 467b26b1de1a..8dfcc4f7ef9a 100644
>+--- a/hw/xfree86/common/xf86platformBus.c
>++++ b/hw/xfree86/common/xf86platformBus.c
>+@@ -401,10 +401,9 @@ xf86platformProbeDev(DriverPtr drvp)
>+                 /* for non-seat0 servers assume first device is the master */
>+                 if (ServerIsNotSeat0())
>+                     break;
>+-                if (xf86_platform_devices[j].pdev) {
>+-                    if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
>+-                        break;
>+-                }
>++
>++                if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
>++                    break;
>+             }
>+         }
>+ 
>diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
>index efc00c3..438fb7d 100644
>--- a/xorg-x11-server.spec
>+++ b/xorg-x11-server.spec
>@@ -99,6 +99,10 @@ Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
> # submitted http://lists.x.org/archives/xorg-devel/2014-July/042936.html
> Patch10200: 0001-xwayland-Snap-damage-reports-to-the-bounding-box.patch
> 
>+# submitted http://lists.x.org/archives/xorg-devel/2014-June/042891.html
>+Patch10300: 0001-xfree86-Fallback-to-first-platform-device-as-primary.patch
>+Patch10301: 0002-xfree86-Allow-non-PCI-devices-as-primary.patch
>+
> %global moduledir	%{_libdir}/xorg/modules
> %global drimoduledir	%{_libdir}/dri
> %global sdkdir		%{_includedir}/xorg
>-- 
>2.0.4
>

Actions: View | Diff

Attachments on bug 1127001: 924286 | 924552