pool/xf86-video-vmware
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch

Browse Source 
* prevent endless looping during Xserver reset (bnc#900884)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vmware?expand=0&rev=28
This commit is contained in:
Stefan Dirsch 2014-10-14 10:03:17 +00:00 committed by Git OBS Bridge
parent d14ce87c66
commit f2d5caf4f8
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch Normal file
View File

@ -0,0 +1,32 @@
From 32562129750077a23f26f2e69adc8403eb24bf3f Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed, 3 Sep 2014 07:08:41 -0700
Subject: [PATCH] vmware/vmwgfx: Don't add pixmaps to the pixmap list if
they're already on it
This could cause loops through the list to spin indefinitely.
This would most likely occur at VT switches.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
---
vmwgfx/vmwgfx_saa.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index b9204c6..bca3d93 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -694,7 +694,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
vmwgfx_pixmap_free_storage(vpix);
- WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
+ if (WSBMLISTEMPTY(&vpix->pixmap_list))
+ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
return TRUE;
--
1.8.4.5

6
xf86-video-vmware.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 14 09:23:37 UTC 2014 - sndirsch@suse.com
- U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch
* prevent endless looping during Xserver reset (bnc#900884)
-------------------------------------------------------------------
Mon Oct 6 10:55:58 UTC 2014 - sndirsch@suse.com

2
xf86-video-vmware.spec
View File

@ -26,6 +26,7 @@ Url: http://xorg.freedesktop.org/
#http://xorg.freedesktop.org/releases/individual/driver/
Source0: %{name}-%{version}.tar.bz2
Patch0: u_xf86xv.h-cannot-be-included-without-first-including-.patch
Patch1: U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch
ExclusiveArch: %ix86 x86_64
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
@ -51,6 +52,7 @@ vmware is an Xorg driver for VMware virtual video cards.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure