Attachment 924286 Details for Bug 1127001 – Patch that implements this for rawhide

[patch] Patch that implements this for rawhide

0001-add-patch-modesetting-don-t-be-a-GPU-screen.patch (text/plain), 3.14 KB, created by Stephen Warren on 2014-08-05 20:44:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Warren

Created: 2014-08-05 20:44:59 UTC

Size: 3.14 KB

patch

obsolete

>From 1fe01662205f42c921958856b347f2840eaf09af Mon Sep 17 00:00:00 2001
>From: Stephen Warren <swarren@nvidia.com>
>Date: Tue, 5 Aug 2014 13:23:50 -0600
>Subject: [PATCH] add patch: modesetting: don't be a GPU screen
>
>---
> modesetting-don-t-be-a-GPU-screen.patch | 49 +++++++++++++++++++++++++++++++++
> xorg-x11-drv-modesetting.spec           |  2 ++
> 2 files changed, 51 insertions(+)
> create mode 100644 modesetting-don-t-be-a-GPU-screen.patch
>
>diff --git a/modesetting-don-t-be-a-GPU-screen.patch b/modesetting-don-t-be-a-GPU-screen.patch
>new file mode 100644
>index 0000000..af7df5a
>--- /dev/null
>+++ b/modesetting-don-t-be-a-GPU-screen.patch
>@@ -0,0 +1,49 @@
>+From patchwork Tue Aug  5 17:59:34 2014
>+Content-Type: text/plain; charset="utf-8"
>+MIME-Version: 1.0
>+Content-Transfer-Encoding: 7bit
>+Subject: modesetting: don't be a GPU screen
>+From: Rob Clark <robdclark@gmail.com>
>+X-Patchwork-Id: 31056
>+Message-Id: <1407261574-11521-1-git-send-email-robdclark@gmail.com>
>+To: xorg-devel@lists.x.org
>+Cc: Rob Clark <robdclark@gmail.com>,
>+ Thierry Reding <thierry.reding@gmail.com>, swarren@nvidia.com
>+Date: Tue,  5 Aug 2014 13:59:34 -0400
>+
>+It doesn't actually make any sense for a kms-only ddx.  And it causes
>+problems with non-PCI devices, because some xservers will skip trying to
>+claim the device as a regular device if it is not a PCI device.  The
>+following two xserver patches should fix this:
>+
>+  http://patchwork.freedesktop.org/patch/28494/
>+  http://patchwork.freedesktop.org/patch/28495/
>+
>+but since a display-only non-display device makes no sense, let's just
>+nuke that code to avoid being a problem.
>+
>+Signed-off-by: Rob Clark <robdclark@gmail.com>
>+
>+---
>+src/driver.c | 6 +-----
>+ 1 file changed, 1 insertion(+), 5 deletions(-)
>+
>+diff --git a/src/driver.c b/src/driver.c
>+index d99b027..46ff0da 100644
>+--- a/src/driver.c
>++++ b/src/driver.c
>+@@ -351,13 +351,9 @@ ms_platform_probe(DriverPtr driver,
>+ {
>+     ScrnInfoPtr scrn = NULL;
>+     const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
>+-    int scr_flags = 0;
>+-
>+-    if (flags & PLATFORM_PROBE_GPU_SCREEN)
>+-            scr_flags = XF86_ALLOCATE_GPU_SCREEN;
>+ 
>+     if (probe_hw(path, dev)) {
>+-        scrn = xf86AllocateScreen(driver, scr_flags);
>++        scrn = xf86AllocateScreen(driver, 0);
>+         xf86AddEntityToScreen(scrn, entity_num);
>+ 
>+         scrn->driverName = "modesetting";
>diff --git a/xorg-x11-drv-modesetting.spec b/xorg-x11-drv-modesetting.spec
>index 75e11c3..b3161ed 100644
>--- a/xorg-x11-drv-modesetting.spec
>+++ b/xorg-x11-drv-modesetting.spec
>@@ -23,6 +23,7 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
> 
> Patch1: 0001-modesetting-24bpp-are-too-confusing-shadow-our-way-o.patch
> Patch2: 0002-add-mga_g200_a-workaround.patch
>+Patch3: modesetting-don-t-be-a-GPU-screen.patch
> 
> # all X hw drivers aren't built on s390 - no need for separate bug
> ExcludeArch: s390 s390x
>@@ -50,6 +51,7 @@ X.Org X11 modesetting video driver - basic modesetting fallback driver.
> %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
> %patch1 -p1 -b .bpp24
> %patch2 -p1 -b .mgag200
>+%patch3 -p1 -b .gpuscrn
> 
> %build
> autoreconf -vif
>-- 
>2.0.4
>

Actions: View | Diff

Attachments on bug 1127001: 924286 | 924552