Re: [PATCH xserver 2/2] dri2: Invalidate DRI2 buffers for all windows with the same pixmap on swap.

2011-04-06 Thread Michel Dänzer
On Son, 2011-03-27 at 23:00 -0700, Keith Packard wrote: On Fri, 25 Mar 2011 18:26:56 +0100, Michel Dänzer mic...@daenzer.net wrote: From: Michel Dänzer daen...@vmware.com Without this, when a compositing manager unredirects a fullscreen window which uses DRI2 and page flipping, the

Re: [PULL] [xorg/xserver] XRes v1.2

2011-04-06 Thread Erkki Seppala
On 05.04.2011 18:58, Keith Packard wrote: On Tue, 05 Apr 2011 18:38:41 +0300, Erkki Seppalaerkki.sepp...@vincit.fi wrote: On 05.04.2011 17:54, Keith Packard wrote: Please just fix users of the existing 'Hash' function to call HashResourceID directly. Hm, are you sure? It looks like this

Re: [PATCH 5/5] dix: don't free stranger pointers inside AllocARGBCursor

2011-04-06 Thread Ander Conselvan de Oliveira
On 04/04/2011 08:54 PM, Tiago Vignatti wrote: This seems a good convention to follow: if pointers are allocate outside a given function, then free there as well when a failure occurs. AllocARGBCursor and its callers were mixing up the freeing of resources and causing a particular double free

Re: [PATCH] Decouple the test suite from make check

2011-04-06 Thread Dan Nicholson
On Tue, Apr 5, 2011 at 10:55 PM, Peter Hutterer peter.hutte...@who-t.net wrote: On Tue, Apr 05, 2011 at 04:24:40PM -0700, Aaron Plattner wrote: The check target is run during distcheck after the test suite is built, so having it run the test suite itself means that the suite has to pass

Re: [PULL] Fix XWin compilation after commit 769531b9

2011-04-06 Thread Jon TURNEY
On 25/03/2011 19:34, Jon TURNEY wrote: Hi Keith, Please consider pulling this patch into master. Ping? For my future reference, do you have any preference to receive single patches as pull requests or as a patch? Thanks. The following changes since commit

Re: [PULL] Fix XWin compilation after commit 769531b9

2011-04-06 Thread Keith Packard
On Wed, 06 Apr 2011 13:50:27 +0100, Jon TURNEY jon.tur...@dronecode.org.uk wrote: On 25/03/2011 19:34, Jon TURNEY wrote: Hi Keith, Please consider pulling this patch into master. Ping? Sorry, I must have mis-marked this in my to-do patch queue. Thanks for the ping. Merged.

[PATCH sis 04/15] Fix suggest parentheses around operand of ‘!’ compiler warnings.

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_cursor.c |2 +- src/sis_utility.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sis_cursor.c b/src/sis_cursor.c index 13eddc4..67a3402 100644 --- a/src/sis_cursor.c +++ b/src/sis_cursor.c @@

[PATCH sis 00/15] a bunch of cleanups, and a taste of things to come

2011-04-06 Thread Timo Aaltonen
Here's a first set of patches to xf86-video-sis, hoping to narrow down the diff against Thomas Winischofer's 'sisfree' (*) package and the forked versions from Intel and SiS (and Mandriva). The first 13 are more or less self-explanatory, but the two final ones are moving things around to make the

[PATCH sis 03/15] Fix format not a string literal and no format arguments compile warnings

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_driver.c |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sis_driver.c b/src/sis_driver.c index 8ce1cdd..337bba6 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -403,14 +403,14 @@

[PATCH sis 02/15] Replace deprecated x(c)alloc/xfree with m/calloc/free

2011-04-06 Thread Timo Aaltonen
and xrealloc with realloc. Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/initextx.c | 18 src/sis6326_video.c |6 +- src/sis_dga.c |6 +- src/sis_dri.c | 24 +- src/sis_driver.c| 128

[PATCH sis 01/15] Write out remaining IS_SIS* macros.

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/init.c| 35 +-- src/init301.c | 48 src/initdef.h | 19 +-- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git

[PATCH sis 06/15] Declare mmioFlags only if XSERVER_LIBPCIACCESS isn't defined

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_driver.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/sis_driver.c b/src/sis_driver.c index 337bba6..61fd515 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -7103,7 +7103,9 @@ static Bool

[PATCH sis 05/15] Fix compile warnings of uninitialized variables

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_utility.c |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/sis_utility.c b/src/sis_utility.c index 0892cf5..0e9dc5b 100644 --- a/src/sis_utility.c +++ b/src/sis_utility.c @@ -1550,7 +1550,9 @@

[PATCH sis 09/15] Drop unused and non-working XAA trapezoid support for 310 series and later

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis310_accel.c | 176 1 files changed, 0 insertions(+), 176 deletions(-) diff --git a/src/sis310_accel.c b/src/sis310_accel.c index befb095..26c4c00 100644 ---

[PATCH sis 07/15] Purge obsolete and unused SIS_CP checks

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/init.h |3 --- src/init301.c| 14 -- src/init301.h|3 --- src/sis.h| 11 --- src/sis_driver.c | 12 src/sis_opt.c| 16 src/sis_video.c |

[PATCH sis 08/15] Drop useless checks and relevant code for old XFree86 releases

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis.h | 11 src/sis310_accel.c | 42 --- src/sis6326_video.c | 54 src/sis_cursor.c|6 src/sis_dri.c | 14 --

[PATCH sis 10/15] Remove unused code from sis_video.c

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis310_accel.c | 536 src/sis_accel.c| 128 - 2 files changed, 0 insertions(+), 664 deletions(-) diff --git a/src/sis310_accel.c b/src/sis310_accel.c index

[PATCH sis 14/15] Move configurable values from sis.h to sis_config.h

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis.h| 40 +- src/sis_config.h | 71 ++ 2 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 src/sis_config.h diff --git

[PATCH sis 11/15] Remove unused code from SISPutImageBlit()

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_video.c | 66 --- 1 files changed, 0 insertions(+), 66 deletions(-) diff --git a/src/sis_video.c b/src/sis_video.c index 9859f33..17d8f71 100644 --- a/src/sis_video.c +++

[PATCH sis 12/15] Remove unused non-working Xv deinterlacer code

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis.h |7 -- src/sis_video.c| 55 src/sis_video.h|9 src/sis_videostr.h |3 -- 4 files changed, 0 insertions(+), 74 deletions(-) diff

[PATCH sis 13/15] Remove deprecated XV SD interface

2011-04-06 Thread Timo Aaltonen
Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis.h | 17 -- src/sis_utility.c | 515 - src/sis_video.c | 71 src/sis_video.h | 180 --- 4 files changed, 0 insertions(+), 783

Re: [PATCH xserver 2/2] dri2: Invalidate DRI2 buffers for all windows with the same pixmap on swap.

2011-04-06 Thread Keith Packard
On Wed, 06 Apr 2011 10:19:01 +0200, Michel Dänzer mic...@daenzer.net wrote: 10 days have passed. I hoped you would take a few minutes and write a more efficient version. Like this. diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index 10be599..6e9abb2 100644 ---

Re: [PATCH] Don't report old relative values in getValuatorEvents

2011-04-06 Thread Chase Douglas
On 04/05/2011 07:31 PM, Jeremy Huddleston wrote: (related to my recent reply for the 1.10 merge of this patch) I believe this should this instead be: +else if (dev dev-valuator-axes[xv-first_valuator + j].mode == Absolute) As much as I just want to be done with this issue, I

[PATCH] Fix unset valuator handling for XI 1.x valuator events again

2011-04-06 Thread Chase Douglas
Set the valuator values for unset masked absolute valuators in the internal device event. This ensures the values will always be correct in getValuatorEvents even if the device has been removed. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- dix/eventconvert.c | 14 +-

Re: [PATCH sis 04/15] Fix suggest parentheses around operand of ‘!’ compiler warnings.

2011-04-06 Thread Mark Kettenis
From: Timo Aaltonen tjaal...@ubuntu.com Date: Wed, 6 Apr 2011 19:50:06 +0300 Signed-off-by: Timo Aaltonen timo.aalto...@canonical.com --- src/sis_cursor.c |2 +- src/sis_utility.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sis_cursor.c

Re: [PATCH] Fix unset valuator handling for XI 1.x valuator events again

2011-04-06 Thread Jeremy Huddleston
why do we no longer need to check the valuators.mask? It looks like (from just the src changes here) that the !absolute (relative) case would still need to be handled. if (BitIsOn(ev-valuators.mask, xv-first_valuator + j)) valuators[j] =

Re: [PATCH] Fix unset valuator handling for XI 1.x valuator events again

2011-04-06 Thread Chase Douglas
On 04/06/2011 07:10 PM, Jeremy Huddleston wrote: why do we no longer need to check the valuators.mask? It looks like (from just the src changes here) that the !absolute (relative) case would still need to be handled. if (BitIsOn(ev-valuators.mask, xv-first_valuator + j))

[PATCH] Xext: use EXT_MASK macro instead of manual 0x7f

2011-04-06 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xext/geext.c |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Xext/geext.c b/Xext/geext.c index b37c1a0..3c4e640 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -49,6 +49,7 @@ static const int

Re: On complexifigurability

2011-04-06 Thread Peter Hutterer
On Tue, Apr 05, 2011 at 06:37:47PM +0100, Daniel Stone wrote: It's about organization of the code really, which leads to correct driver API usage, so we could talk about deprecation and proper versioning of unused/old/unmaintained drivers - we would be enforcing ourselves to use correct

Re: [PATCH] Fix unset valuator handling for XI 1.x valuator events again

2011-04-06 Thread Peter Hutterer
On Wed, Apr 06, 2011 at 02:51:45PM -0400, Chase Douglas wrote: Set the valuator values for unset masked absolute valuators in the internal device event. This ensures the values will always be correct in getValuatorEvents even if the device has been removed. Signed-off-by: Chase Douglas

Splitting protocol screens from the driver interface

2011-04-06 Thread Aaron Plattner
Hi Dave, I like the idea of separating the driver from the protocol screens, and am interested in helping out. I think it might be easiest in the short term to let the overlay functionality I talked about break and then I can add it back later in whatever form makes the most sense with the new

[PULL 1.10] input fixes for 1.10

2011-04-06 Thread Peter Hutterer
Note these don't yet include Chase' valuator fixes, I'll send a separate pull request for those once I've merged and tested them. The following changes since commit 49afcc76a1c799e18931cc762431975c5c059437: XQuartz: Bump bundle version to 2.6.2 (2011-04-04 09:38:35 -0700) are available in the

Re: [PATCH] Xext: use EXT_MASK macro instead of manual 0x7f

2011-04-06 Thread Alan Coopersmith
On 04/ 6/11 05:48 PM, Peter Hutterer wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +if ((EXT_MASK(extension)) = MAXEXTENSIONS) You could probably drop a set of parens there, but that's just a minor style nit. Either way, Reviewed-by: Alan Coopersmith

[PULL] valuator handling fix

2011-04-06 Thread Peter Hutterer
One more fix for XI 1.x valuator handling. The following changes since commit 3085b178626c957854385c7a88a05ec3c7eb74f3: Merge remote-tracking branch 'jturney/master' (2011-04-06 08:34:10 -0700) are available in the git repository at: git://people.freedesktop.org/~whot/xserver.git for-keith

Re: [PULL 1.10] input fixes for 1.10

2011-04-06 Thread Jeremy Huddleston
Merged. Thanks. 49afcc7..1f51fe4 server-1.10-branch - server-1.10-branch On Apr 6, 2011, at 18:12, Peter Hutterer wrote: Note these don't yet include Chase' valuator fixes, I'll send a separate pull request for those once I've merged and tested them. The following changes since

Re: Splitting protocol screens from the driver interface

2011-04-06 Thread Dave Airlie
On Thu, Apr 7, 2011 at 10:59 AM, Aaron Plattner aplatt...@nvidia.com wrote: Hi Dave, I like the idea of separating the driver from the protocol screens, and am interested in helping out.  I think it might be easiest in the short term to let the overlay functionality I talked about break and

Re: [PULL] valuator handling fix

2011-04-06 Thread Keith Packard
On Thu, 7 Apr 2011 12:47:27 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: Chase Douglas (1): Fix unset valuator handling for XI 1.x valuator events again Peter Hutterer (1): Xext: use EXT_MASK macro instead of manual 0x7f Merged. 3085b17..7aad7db master - master

Re: [PULL] [xorg/xserver] XRes v1.2

2011-04-06 Thread Keith Packard
On Wed, 06 Apr 2011 12:16:23 +0300, Erkki Seppala erkki.sepp...@vincit.fi wrote: On 05.04.2011 18:58, Keith Packard wrote: On Tue, 05 Apr 2011 18:38:41 +0300, Erkki Seppalaerkki.sepp...@vincit.fi wrote: On 05.04.2011 17:54, Keith Packard wrote: Please just fix users of the existing