Bug#683366: xserver-xorg-input-joystick: Xorg segfaults with two different gamepads

2012-08-02 Thread Andrei POPESCU
On Ma, 31 iul 12, 19:45:34, Julien Cristau wrote:
> > 
> > Don't hesitate to ask for more info if necessary.
> > 
> See
> http://wiki.debian.org/XStrikeForce/XserverDebugging#Obtaining_a_backtrace_with_gdb

My first attempts produced only a small backtrace (attached) which seems 
to be indication of missing some -dbg packages (I already have -core-dbg 
installed).

Since I can't find a -joystick-dbg package I'm assuming I have to 
recompile -joystick myself. I'll look into it as soon as possible, but 
definitely not this weekend.

Kind regards,
Andrei
-- 
Offtopic discussions among Debian users and developers:
http://lists.alioth.debian.org/mailman/listinfo/d-community-offtopic
Continuing.

Program received signal SIGSEGV, Segmentation fault.
0xb760dd1d in fill_pointer_events (events=0xb711d948, events@entry=0xb711d008, 
pDev=pDev@entry=0xb90661a8, type=4, buttons=buttons@entry=4, 
ms=ms@entry=400932, flags=flags@entry=0, mask_in=mask_in@entry=0xbfd2543c)
at ../../dix/getevents.c:1416
1416../../dix/getevents.c: No such file or directory.
#0  0xb760dd1d in fill_pointer_events (events=0xb711d948, 
events@entry=0xb711d008, pDev=pDev@entry=0xb90661a8, type=4, 
buttons=buttons@entry=4, ms=ms@entry=400932, flags=flags@entry=0, 
mask_in=mask_in@entry=0xbfd2543c)
at ../../dix/getevents.c:1416
num_events = 2
event = 0xb711d948
raw = 0xb711d008
screenx = 0
screeny = 0
devx = 0
devy = 0
mask = {last_bit = -1 '\377', mask = "\000\000\000\000", valuators = {0 
}}
scr = 0x0
#1  0xb760f0bf in GetPointerEvents (events=0xb711d008, 
pDev=pDev@entry=0xb90661a8, type=, type@entry=4, 
buttons=buttons@entry=4, flags=flags@entry=0, mask_in=mask_in@entry=0xbfd25754)
at ../../dix/getevents.c:1612
ms = 400932
num_events = 0
nev_tmp = 
mask = {last_bit = -1 '\377', mask = "\000\000\000\000", valuators = {0 
}}
scroll = {last_bit = 0 '\000', mask = "\000\000\000\000", valuators = 
{0 , -0.28652589708771159, -4.7404743315003783e-42, 
-0.28652971178396025, -4.7404743315003885e-42, -1.1241162361437768e-53, 0, 
-4.9661689146343941e-42, 1.5198813677875627e-314, 
-4.9661709654107757e-42, 1.5198791049669048e-314, -4.7448999166895584e-42, 0, 
-5.0654640480049104e-42, -0.28652589708300935, -5.0654640480049104e-42, 
-1.9437068877139197e-41, -5.181012838561e-43, 
-1.436682506511008e-34, 3.3950757136910782e-314, -5.3881454744661428e-34, 
2.1219957909652723e-314}}
i = 
realtype = 4
#2  0xb760f5fc in QueuePointerEvents (device=device@entry=0xb90661a8, 
type=type@entry=4, buttons=buttons@entry=4, flags=flags@entry=0, 
mask=mask@entry=0xbfd25754) at ../../dix/getevents.c:1260
nevents = 
#3  0xb7647a3f in xf86PostButtonEventM (device=device@entry=0xb90661a8, 
is_absolute=is_absolute@entry=0, button=button@entry=4, 
is_down=is_down@entry=1, mask=mask@entry=0xbfd25754)
at ../../../../hw/xfree86/common/xf86Xinput.c:1267
flags = 0
#4  0xb7647c20 in xf86PostButtonEvent (device=0xb90661a8, is_absolute=0, 
button=4, is_down=1, first_valuator=0, num_valuators=0) at 
../../../../hw/xfree86/common/xf86Xinput.c:1225
var = 
mask = {last_bit = -1 '\377', mask = "\000\000\000\000", valuators = {0 
}}
i = 
__FUNCTION__ = "xf86PostButtonEvent"
#5  0xb4f15d28 in ?? () from /usr/lib/xorg/modules/input/joystick_drv.so
No symbol table info available.
#6  0xb7736482 in DoTimer (timer=0xb910ceb8, now=now@entry=400931, 
prev=prev@entry=0xb77b0410) at ../../os/WaitFor.c:406
newTime = 
#7  0xb7736a91 in WaitForSomething 
(pClientsReady=pClientsReady@entry=0xb8fb9d18) at ../../os/WaitFor.c:262
expired = 
i = 
waittime = {tv_sec = 0, tv_usec = 0}
wt = 0xbfd259a8
timeout = 
clientsReadable = {fds_bits = {0 }}
clientsWritable = {fds_bits = {-1216680632, 0, -1076733328, 
-1218458515, -1216680616, 0, -1190593628, -1216716812, -1076733300, 2, 
-1192195920, -1217788034, -1216680632, -1076733328, -1192204096, -1218458515, 
-1190593784, 594, 1073741825, -1192193816, 0, -1076733272, 1, 
-1076733112, -1221527973, -1216716812, 594, -1216716812, -1076733112, 1, 
-1190888512, -1217130686}}
selecterr = 0
nready = 0
devicesReadable = {fds_bits = {1073741824, 0 }}
now = 400931
someReady = 
#8  0xb75f80ee in Dispatch () at ../../dix/dispatch.c:357
clientReady = 0xb8fb9d18
result = 
client = 
nready = 
icheck = 0xb77b2118
start_tick = 
#9  0xb75e5e95 in main (argc=6, argv=0xbfd25d34, envp=0xbfd25d50) at 
../../dix/main.c:288
i = 
alwaysCheckForInput = {0, 1}


signature.asc
Description: Digital signature


xserver-xorg-video-intel: Changes to 'ubuntu-precise'

2012-08-02 Thread Timo Aaltonen
New branch 'ubuntu-precise' available with the following commits:
commit eef345786e6706033fe00aa8bd396215a6fb2fbf
Author: Timo Aaltonen 
Date:   Fri Aug 3 09:02:47 2012 +0300

push to precise-proposed

commit 1f40863e7048d606c42f00e3a467dd7f5ae7656c
Author: Timo Aaltonen 
Date:   Fri Aug 3 09:02:27 2012 +0300

Add 105_reduce_ivb_gt1_max_thread_count.patch, backported commit from 
upstream to reduce the thread count on IVB GT1. (LP: #1031784)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sxazg-0004j3...@vasks.debian.org



libxrandr: Changes to 'debian-experimental'

2012-08-02 Thread Maarten Lankhorst
 debian/libxrandr2.symbols |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 995a9761680cb2f619ea4970c7a8ea93b3a346df
Author: Maarten Lankhorst 
Date:   Fri Aug 3 04:03:12 2012 +0200

Add provider related symbols

diff --git a/debian/libxrandr2.symbols b/debian/libxrandr2.symbols
index 91aab71..442966f 100644
--- a/debian/libxrandr2.symbols
+++ b/debian/libxrandr2.symbols
@@ -3,6 +3,7 @@ libXrandr.so.2 libxrandr2 #MINVER#
  XRRAllocGamma@Base 2:1.2.0
  XRRAllocModeInfo@Base 2:1.2.0
  XRRChangeOutputProperty@Base 2:1.2.0
+ XRRChangeProviderProperty@Base 2:1.4.0
  XRRConfigCurrentConfiguration@Base 0
  XRRConfigCurrentRate@Base 4.3
  XRRConfigRates@Base 4.3
@@ -10,15 +11,19 @@ libXrandr.so.2 libxrandr2 #MINVER#
  XRRConfigSizes@Base 0
  XRRConfigTimes@Base 0
  XRRConfigureOutputProperty@Base 2:1.2.0
+ XRRConfigureProviderProperty@Base 2:1.4.0
  XRRCreateMode@Base 2:1.2.0
  XRRDeleteOutputMode@Base 2:1.2.0
  XRRDeleteOutputProperty@Base 2:1.2.0
+ XRRDeleteProviderProperty@Base 2:1.4.0
  XRRDestroyMode@Base 2:1.2.0
  XRRFreeCrtcInfo@Base 2:1.2.0
  XRRFreeGamma@Base 2:1.2.0
  XRRFreeModeInfo@Base 2:1.2.0
  XRRFreeOutputInfo@Base 2:1.2.0
  XRRFreePanning@Base 2:1.2.99.2
+ XRRFreeProviderInfo@Base 2:1.4.0
+ XRRFreeProviderResources@Base 2:1.4.0
  XRRFreeScreenConfigInfo@Base 0
  XRRFreeScreenResources@Base 2:1.2.0
  XRRGetCrtcGamma@Base 2:1.2.0
@@ -29,13 +34,18 @@ libXrandr.so.2 libxrandr2 #MINVER#
  XRRGetOutputPrimary@Base 2:1.2.99.3
  XRRGetOutputProperty@Base 2:1.2.0
  XRRGetPanning@Base 2:1.2.99.2
+ XRRGetProviderInfo@Base 2:1.4.0
+ XRRGetProviderProperty@Base 2:1.4.0
+ XRRGetProviderResources@Base 2:1.4.0
  XRRGetScreenInfo@Base 0
  XRRGetScreenResources@Base 2:1.2.0
  XRRGetScreenResourcesCurrent@Base 2:1.2.99.2
  XRRGetScreenSizeRange@Base 2:1.2.0
  XRRListOutputProperties@Base 2:1.2.0
+ XRRListProviderProperties@Base 2:1.4.0
  XRRQueryExtension@Base 0
  XRRQueryOutputProperty@Base 2:1.2.0
+ XRRQueryProviderProperty@Base 2:1.4.0
  XRRQueryVersion@Base 0
  XRRRates@Base 4.3
  XRRRootToScreen@Base 0
@@ -46,6 +56,8 @@ libXrandr.so.2 libxrandr2 #MINVER#
  XRRSetCrtcTransform@Base 2:1.2.99.2
  XRRSetOutputPrimary@Base 2:1.2.99.3
  XRRSetPanning@Base 2:1.2.99.2
+ XRRSetProviderOffloadSink@Base 2:1.4.0
+ XRRSetProviderOutputSource@Base 2:1.4.0
  XRRSetScreenConfig@Base 0
  XRRSetScreenConfigAndRate@Base 4.3
  XRRSetScreenSize@Base 2:1.2.0


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sx7gv-0002gn...@vasks.debian.org



Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Filipus Klutiero

On 2012-08-02 18:05, Sven Joachim wrote:

On 2012-08-02 23:34 +0200, Filipus Klutiero wrote:


I am very ignorant about graphics drivers, Mesa, 3D and nouveau, and
it's great if Mesa 8.1 fixes this, but meanwhile, from what you're
saying, I'm wondering if Mesa is the faulty part.

Could also be the kernel, but most likely it's Mesa.


If I understand
correctly that the Mesa driver doesn't support the card,

The driver does support the card, but it is rather buggy and not
supported itself by the upstream developers.


isn't nouveau at fault for using that driver anyway?

There are several drivers for different card generations with varying
degrees of support; the problem is that they are contained in the same
file.  See http://nouveau.freedesktop.org/wiki/MesaDrivers.

You can disable the 3D driver by putting LIBGL_ALWAYS_SOFTWARE=1 into
the environment; forget about most games then, since the software
renderer is usually too slow for them.


Thank you. So if I understand correctly, you're saying I'm using nvfx, 
which upstream doesn't support anymore. While the long-term path is 
clear (use nv30 with Mesa 8.1+), for squeeze we have to decide what to 
do. As far as I can see, either we support nvfx for squeeze without 
upstream's help, or we prevent nouveau from doing hardware-accelerated 
3D on this hardware.



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/501b163d.7050...@gmail.com



Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Sven Joachim
On 2012-08-02 23:34 +0200, Filipus Klutiero wrote:

> I am very ignorant about graphics drivers, Mesa, 3D and nouveau, and
> it's great if Mesa 8.1 fixes this, but meanwhile, from what you're
> saying, I'm wondering if Mesa is the faulty part.

Could also be the kernel, but most likely it's Mesa.

> If I understand
> correctly that the Mesa driver doesn't support the card,

The driver does support the card, but it is rather buggy and not
supported itself by the upstream developers.

> isn't nouveau at fault for using that driver anyway?

There are several drivers for different card generations with varying
degrees of support; the problem is that they are contained in the same
file.  See http://nouveau.freedesktop.org/wiki/MesaDrivers.

You can disable the 3D driver by putting LIBGL_ALWAYS_SOFTWARE=1 into
the environment; forget about most games then, since the software
renderer is usually too slow for them.

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/878vdx3q7m@turtle.gmx.de



Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Filipus Klutiero

On 2012-08-02 14:43, Sven Joachim wrote:

reassign 683363 libgl1-mesa-dri 8.0.3-1
thanks

On 2012-08-02 14:39 +0200, Filipus Klutiero wrote:


Disabling AIGLX does not help. Downgrading does not help (I must have
upgraded hoping it would help).

Thanks, reassigning to the 3D driver then (which, as I said, is not
supported for your card; Mesa 8.1 will have a new driver that might work
better).

Cheers,
Sven


I am very ignorant about graphics drivers, Mesa, 3D and nouveau, and 
it's great if Mesa 8.1 fixes this, but meanwhile, from what you're 
saying, I'm wondering if Mesa is the faulty part. If I understand 
correctly that the Mesa driver doesn't support the card, isn't nouveau 
at fault for using that driver anyway?



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/501af24f.6010...@gmail.com



Processed: Re: Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> reassign 683363 libgl1-mesa-dri 8.0.3-1
Bug #683363 [xserver-xorg-video-nouveau] xserver-xorg-video-nouveau: basically 
freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ 
overflowing, mouse may still move)
Bug reassigned from package 'xserver-xorg-video-nouveau' to 'libgl1-mesa-dri'.
No longer marked as found in versions xserver-xorg-video-nouveau/1:1.0.1-3.
Ignoring request to alter fixed versions of bug #683363 to the same values 
previously set
Bug #683363 [libgl1-mesa-dri] xserver-xorg-video-nouveau: basically freezes 
when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ 
overflowing, mouse may still move)
Marked as found in versions mesa/8.0.3-1.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
683363: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683363
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.13439330195441.transcr...@bugs.debian.org



Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Sven Joachim
reassign 683363 libgl1-mesa-dri 8.0.3-1
thanks

On 2012-08-02 14:39 +0200, Filipus Klutiero wrote:

> Disabling AIGLX does not help. Downgrading does not help (I must have
> upgraded hoping it would help).

Thanks, reassigning to the 3D driver then (which, as I said, is not
supported for your card; Mesa 8.1 will have a new driver that might work
better).

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87hasl3zji@turtle.gmx.de



Processed: Bug#567251: xserver-xorg-input-mouse: kfreebsd-i386 no core pointer: mouse unresponsive

2012-08-02 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> # I wasn't seeing the same issue
> notfound 567251 xserver-xorg-input-mouse/1:1.7.2-2
Bug #567251 [xserver-xorg-input-mouse] xserver-xorg-input-mouse: kfreebsd-i386 
no core pointer: mouse unresponsive
No longer marked as found in versions xserver-xorg-input-mouse/1:1.7.2-2.
> tags 567251 + moreinfo
Bug #567251 [xserver-xorg-input-mouse] xserver-xorg-input-mouse: kfreebsd-i386 
no core pointer: mouse unresponsive
Added tag(s) moreinfo.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
567251: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567251
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.134392927618182.transcr...@bugs.debian.org



xorg-server: Changes to 'ubuntu-precise'

2012-08-02 Thread Timo Aaltonen
 debian/changelog  |8 
 debian/patches/series |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 47b30951c24a1a3cb1907730c5e261062260bec1
Author: Timo Aaltonen 
Date:   Thu Aug 2 17:24:13 2012 +0300

re-enable patch 516, push to proposed

diff --git a/debian/changelog b/debian/changelog
index fad498f..5842c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.11.4-0ubuntu10.7) precise-proposed; urgency=low
+
+  * Re-enable 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+from upstream 1.12.2. Fixes the server from entering in an infinite
+loop in certain situations. (LP: #921236)
+
+ -- Timo Aaltonen   Thu, 02 Aug 2012 17:14:39 +0300
+
 xorg-server (2:1.11.4-0ubuntu10.6) precise-proposed; urgency=low
 
   * Revert changes from 10.2 and 10.3 (and the unreleased SRU 10.4).  10.2
diff --git a/debian/patches/series b/debian/patches/series
index e45658c..0ce1ed6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,4 +49,4 @@
 #513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
 #514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
 #515-dix-disable-all-devices-before-shutdown.patch
-#516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1swwku-0004e1...@vasks.debian.org



xserver-xorg-input-vmmouse: Changes to 'ubuntu'

2012-08-02 Thread Timo Aaltonen
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f05bcb6e87dbb2d9f45e4d99efa921157325bf61
Author: Timo Aaltonen 
Date:   Thu Aug 2 16:31:08 2012 +0300

rebuild for quantal-proposed

diff --git a/debian/changelog b/debian/changelog
index 7452af2..60467f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-vmmouse (1:12.9.0-0ubuntu2) quantal-proposed; urgency=low
+
+  * Rebuild for xserver 1.13.
+
+ -- Timo Aaltonen   Thu, 02 Aug 2012 16:30:22 +0300
+
 xserver-xorg-input-vmmouse (1:12.9.0-0ubuntu1) quantal; urgency=low
 
   * New upstream bugfix release.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1swvim-0002qa...@vasks.debian.org



Bug#683363: xserver-xorg-video-nouveau: basically freezes when using some 3D apps (Neverball, etracer) on GeForce 7300 GS (EQ overflowing, mouse may still move)

2012-08-02 Thread Filipus Klutiero

Hi Sven,

On 2012-08-01 14:31, Sven Joachim wrote:

On 2012-07-31 02:21 +0200, Filipus Klutiero wrote:


On this system, using a GeForce 7300 GS, nouveau works for general
display, but has a big problem with 3D acceleration.

Yes, the 3D driver in Mesa 8.0 and earlier for this card is known to
have problems, and it's unsupported upstream.  See also
https://bugs.freedesktop.org/show_bug.cgi?id=40406 for a similar case
with the same card.


I noticed this
when starting Neverball. It froze about 2 seconds after starting. The
cursor would then keep moving, but nothing else would
happen. Switching to a tty won't work. I reproduced this at
will. Apparently, the freeze always happens at a specific point. In
Neverball, the welcome screen uses 3D acceleration, so there is no
need to do anything to provoke the crash.

Does it get any better if you disable AIGLX in xorg.conf or downgrade
xserver-xorg-video-nouveau to the version in testing?
Disabling AIGLX does not help. Downgrading does not help (I must have 
upgraded hoping it would help). However, what happens seems to be 
different in that X apparently does not log anything (EQ 
overflowing/backtraces).



I tested the nvidia driver on the same machine and I don't get the
same issue.

If you're serious about 3D, the blob is the least of the evils, at least
until Mesa 8.1 is released


I am able to SSH into the machine when it's frozen and the console
works fine. I can kill X and restart the display manager, but I
couldn't recover (the screen gets garbled).

See http://nouveau.freedesktop.org/wiki/LockupRecovery for possibilities
to recover from the GPU lockup.


Thanks, I wasn't aware of that. I succeeded to kill X that way, but I 
didn't see the console and I didn't quite manage to recover.



X logs backtrace and reports EQ overflowing. As I write these lines, I
realize the highly abnormal X log files on the system. This probably
comes from an nvidia driver-related bug. gdm would not start nor fail
to start before I configured X to use the nvidia driver.

Actually, this is a gdm3 bug.




Thank you

The name of the problematic etracer track is In Search of Vodka. In my 
last test, it froze at 00:51. The previous time (after disabling AIGLX), 
etracer froze differently. the sound stopped after a few seconds. The 
cursor appeared again, this time as a normal mouse cursor).



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/501a750e.9030...@gmail.com



Bug#682099: xserver-xorg-video-ati: EXAPixmaps=On screen tearing at high resolution under certain configurations

2012-08-02 Thread Michel Dänzer
On Son, 2012-07-22 at 13:20 +1000, James Robertson wrote:
> On 21 July 2012 03:45, Michel Dänzer  wrote:
> >
> > Can you elaborate on what exactly 'tearing and corruption' means?
> 
> I have created a brief video to show the tearing.  It occurs when
> basically any input occurs such as typing, moving the mouse and as per
> the video moving windows.
> 
> https://docs.google.com/open?id=0B2vLcjUrgXL-aUdWekU0dE9qbHM

Thanks. That's not what we generally call 'tearing' but looks like some
kind of intermittent display corruption. 

Unfortunately, I don't have any ideas offhand what could cause that.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1343903515.1772.153.camel@thor.local



Bug#682812: calloc (nmemb=0, size=12)

2012-08-02 Thread Michel Dänzer
On Mit, 2012-08-01 at 10:22 +0200, Johann Klammer wrote: 
> Michel Dänzer wrote:
> > On Mit, 2012-07-25 at 23:01 +0200, Johann Klammer wrote:
> >
> > Does the problem still occur with libgl1-mesa-dri version 8.x?
> >
> >
> 
> updated to 8.0.3-1
> 
> Same results.
> Also, I get these unexpected messages on startup of the application:
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 30
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 30
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 55
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 56
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 59
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 58
> nvfx_screen_get_param:95 -  Warning: unknown PIPE_CAP 30

nvfx driver issue, probably harmless.


> but that may be because I did not update the rest of xorg...

No, that doesn't matter for these warnings.


> still black triangles.
> 
> There are calloc calls with zero size at two points before the program 
> continues without interruption.

Looks like one Mesa core bug and one driver bug. These should be
reported upstream at bugs.freedesktop.org.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1343903028.1772.150.camel@thor.local



Bug#683498: xorg: temporary video corruption on new window or frames with Radeon

2012-08-02 Thread Julien Cristau
On Thu, Aug  2, 2012 at 10:22:04 +0200, Alain Rpnpif wrote:

> Le  1 août 2012, Julien Cristau a écrit :
> 
> > Which update are you talking about?
> 
> xorg 1:7.6+8~bpo60+1 
> (with linux-image-3.2.0-0.bpo.2-686-pae 3.2.20-1~bpo60+1)
> I am now unable to determine if the real responsable is xorg or the
> kernel.
> 
X hasn't changed in squeeze-backports in like a year.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#683498: xorg: temporary video corruption on new window or frames with Radeon

2012-08-02 Thread Alain Rpnpif
Le  1 août 2012, Julien Cristau a écrit :

> Which update are you talking about?

xorg 1:7.6+8~bpo60+1 
(with linux-image-3.2.0-0.bpo.2-686-pae 3.2.20-1~bpo60+1)
I am now unable to determine if the real responsable is xorg or the
kernel.

-- 
Alain Rpnpif


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120802082205.3d7a0100...@chro.home



xserver-xorg-video-vmware: Changes to 'ubuntu'

2012-08-02 Thread Timo Aaltonen
 ChangeLog  |   79 +++
 configure.ac   |6 ++
 debian/changelog   |   23 ++
 saa/saa.c  |4 -
 saa/saa.h  |4 +
 src/Makefile.am|1 
 src/compat-api.h   |   99 +
 src/vmware.c   |   44 ++--
 src/vmware.h   |5 --
 src/vmware_common.h|2 
 src/vmwarecurs.c   |   17 ---
 src/vmwarevideo.c  |5 +-
 vmwgfx/vmwgfx_dri2.c   |4 -
 vmwgfx/vmwgfx_driver.c |   73 -
 vmwgfx/vmwgfx_driver.h |7 +--
 vmwgfx/vmwgfx_saa.c|4 -
 vmwgfx/vmwgfx_tex_video.c  |6 +-
 vmwgfx/vmwgfx_xa_surface.c |2 
 18 files changed, 297 insertions(+), 88 deletions(-)

New commits:
commit 4c6570204a5cee3b99530b01f80f53a1e152373f
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:15:04 2012 +0300

release to quantal-proposed

diff --git a/debian/changelog b/debian/changelog
index 48674df..cebdb3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) UNRELEASED; 
urgency=low
+xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) quantal-proposed; 
urgency=low
 
   * Merge from unreleased debian git, remaining changes:
 - Build with XA, enabling accelerated virtualized passthrough
@@ -6,7 +6,7 @@ xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) 
UNRELEASED; urgency=l
   enable_fbdev=1 to the vmwgfx module at load time fixing a crash on
   suspend from inside of the guest in VMware hosts. (LP: 994888)
 
- -- Timo Aaltonen   Thu, 02 Aug 2012 11:09:09 +0300
+ -- Timo Aaltonen   Thu, 02 Aug 2012 11:14:41 +0300
 
 xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low
 

commit b21062ea9edc66af3126c8dbc9122130254e9f82
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:14:38 2012 +0300

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 83b541c..48674df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) UNRELEASED; 
urgency=low
+
+  * Merge from unreleased debian git, remaining changes:
+- Build with XA, enabling accelerated virtualized passthrough
+- Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass
+  enable_fbdev=1 to the vmwgfx module at load time fixing a crash on
+  suspend from inside of the guest in VMware hosts. (LP: 994888)
+
+ -- Timo Aaltonen   Thu, 02 Aug 2012 11:09:09 +0300
+
 xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low
 
   * New upstream snapshot to build against xserver 1.13.

commit 405d30c7312a1e46a7a87de36f762b7918084908
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:08:55 2012 +0300

fix the revision

diff --git a/debian/changelog b/debian/changelog
index 2b49a76..d01fe85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1ubuntu1) UNRELEASED; 
urgency=low
+xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low
 
   * New upstream snapshot to build against xserver 1.13.
 

commit a97b93e5437a9a3df4c8d6f09419727419704477
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:05:11 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 2a5d2ce..accf25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+commit e5ac80d8f72963313358e31cfb1ab98583e26f23
+Author: Dave Airlie 
+Date:   Tue Jul 3 13:50:30 2012 +0100
+
+vmware: avoid warnings about shadowing 'i'
+
+Signed-off-by: Dave Airlie 
+
+commit 46c0862d205eefa985e36a74391ca392640cb898
+Author: Dave Airlie 
+Date:   Sat Jun 16 14:43:52 2012 +0100
+
+vmware: drop infoFromScreen inline in favour of new interface
+
+This also should fix the build regression introduced with the fix
+for this macro.
+
+Signed-off-by: Dave Airlie 
+
+commit 50c01998c7800bc02fd6656cc14efa715bf63e08
+Author: Robert Hooker 
+Date:   Fri Jun 15 11:56:59 2012 -0400
+
+vmware: Fix up some warnings after new compat API change.
+
+Fixes multiple instances of these warnings on x86_64:
+../../src/vmware.h:180:5: warning: implicit declaration of function 
'xf86ScreenToScrn' [-Wimplicit-function-declaration]
+../../src/vmware.h:180:5: warning: nested extern declaration of 
'xf86ScreenToScrn' [-Wnested-externs]
+../../src/vmware.h:180:5: warning: return makes pointer from integer 
without a cast [enabled by default]
+Function `xf86ScreenToScrn' implicitly converted to pointer at 
../../src/vmware.h:180
+
+Reviewed-by: Jakob Bornecrantz 
+Signed-off-by: Robert Hooker 
+Signed-off-by: Jakob Bornecrantz 
+
+commit 61df95a86f4997e342d50d7779b00aba2e8849a6
+Author: Dave Airlie 
+Date:   Wed Jun 6 09:58:01 2012 +0100
+
+vmware: port vmware d

xserver-xorg-video-vmware: Changes to 'debian-experimental'

2012-08-02 Thread Timo Aaltonen
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 405d30c7312a1e46a7a87de36f762b7918084908
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:08:55 2012 +0300

fix the revision

diff --git a/debian/changelog b/debian/changelog
index 2b49a76..d01fe85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1ubuntu1) UNRELEASED; 
urgency=low
+xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low
 
   * New upstream snapshot to build against xserver 1.13.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1swqzj-m2...@vasks.debian.org



xserver-xorg-video-vmware: Changes to 'upstream-experimental'

2012-08-02 Thread Timo Aaltonen
Rebased ref, commits from common ancestor:
commit e5ac80d8f72963313358e31cfb1ab98583e26f23
Author: Dave Airlie 
Date:   Tue Jul 3 13:50:30 2012 +0100

vmware: avoid warnings about shadowing 'i'

Signed-off-by: Dave Airlie 

diff --git a/src/compat-api.h b/src/compat-api.h
index 6bc946f..205ac59 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -46,7 +46,7 @@
 #define SCREEN_ARG_TYPE int
 #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
 
-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char 
**argv
 
 #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, 
pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask

commit 46c0862d205eefa985e36a74391ca392640cb898
Author: Dave Airlie 
Date:   Sat Jun 16 14:43:52 2012 +0100

vmware: drop infoFromScreen inline in favour of new interface

This also should fix the build regression introduced with the fix
for this macro.

Signed-off-by: Dave Airlie 

diff --git a/src/vmware.h b/src/vmware.h
index be113bb..028dff3 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -18,8 +18,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "compat-api.h"
-
 #include 
 
 #ifdef XSERVER_LIBPCIACCESS
@@ -177,10 +175,6 @@ typedef struct {
 
 #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
 
-static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
-return xf86ScreenToScrn(s);
-}
-
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define ABS(x) (((x) >= 0) ? (x) : -(x))
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index 2e2effb..93dacc0 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
 #endif
 
 #include "vmware.h"
+#include "vmware_common.h"
 #include "bits2pixels.h"
 
 static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
 static Bool
 vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
 VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
   pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? 
pVMWARE->oldCurs->refcnt : 0));
@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src 
)
 static Bool
 vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
 {
-ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
 VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt 
%i\n",
   pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? 
pVMWARE->oldCurs->refcnt : 0));
@@ -283,7 +284,7 @@ Bool
 vmwareCursorInit(ScreenPtr pScreen)
 {
 xf86CursorInfoPtr infoPtr;
-VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
 Bool ret;
 
 TRACEPOINT
@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
 void
 vmwareCursorCloseScreen(ScreenPtr pScreen)
 {
-ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
 #ifdef RENDER
 PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
 void
 vmwareCursorHookWrappers(ScreenPtr pScreen)
 {
-VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
 #ifdef RENDER
 PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
 #endif
@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
unsigned int format, unsigned long planeMask, char *pBinImage)
 {
 ScreenPtr pScreen = src->pScreen;
-VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
+VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
 BoxRec box;
 Bool hidden = FALSE;
 
@@ -412,7 +413,7 @@ static void
 VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
 ScreenPtr pScreen = pWin->drawable.pScreen;
-VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
+VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
 BoxPtr pBB;
 Bool hidden = FALSE;
 
@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
CARD16 width, CARD16 height)
 {
 ScreenPtr pScreen = pDst->pDrawable->pScreen;
-VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
 PictureScreenPtr ps = GetPictureScreen(pScreen);
 BoxRec

xserver-xorg-video-vmware: Changes to 'debian-experimental'

2012-08-02 Thread Timo Aaltonen
Rebased ref, commits from common ancestor:
commit a97b93e5437a9a3df4c8d6f09419727419704477
Author: Timo Aaltonen 
Date:   Thu Aug 2 11:05:11 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 2a5d2ce..accf25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+commit e5ac80d8f72963313358e31cfb1ab98583e26f23
+Author: Dave Airlie 
+Date:   Tue Jul 3 13:50:30 2012 +0100
+
+vmware: avoid warnings about shadowing 'i'
+
+Signed-off-by: Dave Airlie 
+
+commit 46c0862d205eefa985e36a74391ca392640cb898
+Author: Dave Airlie 
+Date:   Sat Jun 16 14:43:52 2012 +0100
+
+vmware: drop infoFromScreen inline in favour of new interface
+
+This also should fix the build regression introduced with the fix
+for this macro.
+
+Signed-off-by: Dave Airlie 
+
+commit 50c01998c7800bc02fd6656cc14efa715bf63e08
+Author: Robert Hooker 
+Date:   Fri Jun 15 11:56:59 2012 -0400
+
+vmware: Fix up some warnings after new compat API change.
+
+Fixes multiple instances of these warnings on x86_64:
+../../src/vmware.h:180:5: warning: implicit declaration of function 
'xf86ScreenToScrn' [-Wimplicit-function-declaration]
+../../src/vmware.h:180:5: warning: nested extern declaration of 
'xf86ScreenToScrn' [-Wnested-externs]
+../../src/vmware.h:180:5: warning: return makes pointer from integer 
without a cast [enabled by default]
+Function `xf86ScreenToScrn' implicitly converted to pointer at 
../../src/vmware.h:180
+
+Reviewed-by: Jakob Bornecrantz 
+Signed-off-by: Robert Hooker 
+Signed-off-by: Jakob Bornecrantz 
+
+commit 61df95a86f4997e342d50d7779b00aba2e8849a6
+Author: Dave Airlie 
+Date:   Wed Jun 6 09:58:01 2012 +0100
+
+vmware: port vmware driver to new compat API
+
+This is a port of the vmware driver to the new compat API.
+
+Tested-by: Jakob Bornecrantz 
+Reviewed-by: Jakob Bornecrantz 
+Signed-off-by: Dave Airlie 
+Signed-off-by: Jakob Bornecrantz 
+
+commit 46cdf0ed0ad9df66f36f95e27b209d454f67d526
+Author: Brian Paul 
+Date:   Fri Apr 20 14:24:26 2012 -0600
+
+vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
+
+This fixes a failed assertion in the gallium/svga driver in the
+svga_texture_get_handle() function.  The texture resource wasn't
+getting created with the PIPE_BIND_SHARED flag so the !cachable
+assertion would fail and the X session would abort.  This didn't
+happen with release builds.
+
+Reviewed-by: Jakob Bornecrantz 
+
 commit 4d76cfe5e8e5d594ec357b0ef3339f56eeca9c64
 Author: Jakob Bornecrantz 
 Date:   Tue Mar 20 22:05:30 2012 +0100
diff --git a/debian/changelog b/debian/changelog
index 5546265..2b49a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1ubuntu1) UNRELEASED; 
urgency=low
+
+  * New upstream snapshot to build against xserver 1.13.
+
+ -- Timo Aaltonen   Thu, 02 Aug 2012 10:46:43 +0300
+
 xserver-xorg-video-vmware (1:12.0.2-1) unstable; urgency=low
 
   * New upstream release:

commit e5ac80d8f72963313358e31cfb1ab98583e26f23
Author: Dave Airlie 
Date:   Tue Jul 3 13:50:30 2012 +0100

vmware: avoid warnings about shadowing 'i'

Signed-off-by: Dave Airlie 

diff --git a/src/compat-api.h b/src/compat-api.h
index 6bc946f..205ac59 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -46,7 +46,7 @@
 #define SCREEN_ARG_TYPE int
 #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
 
-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char 
**argv
 
 #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, 
pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask

commit 46c0862d205eefa985e36a74391ca392640cb898
Author: Dave Airlie 
Date:   Sat Jun 16 14:43:52 2012 +0100

vmware: drop infoFromScreen inline in favour of new interface

This also should fix the build regression introduced with the fix
for this macro.

Signed-off-by: Dave Airlie 

diff --git a/src/vmware.h b/src/vmware.h
index be113bb..028dff3 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -18,8 +18,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "compat-api.h"
-
 #include 
 
 #ifdef XSERVER_LIBPCIACCESS
@@ -177,10 +175,6 @@ typedef struct {
 
 #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
 
-static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
-return xf86ScreenToScrn(s);
-}
-
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define ABS(x) (((x) >= 0) ? (x) : -(x))
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index 2e2effb..93dacc0 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
 #endif
 
 #include "vmware.h"
+#include "vmware_common.h"
 #include "bits2pixels.h"
 
 static void VMWAREG