Re: [PATCH xdm] Support reloading xdm through systemd.

2012-04-10 Thread Michał Górny
On Fri, 30 Dec 2011 15:20:25 -0500 Gaetan Nadon wrote: > > In the meantime, currently the officially supported way of doing > > this is through calling /bin/kill. Maybe it will become some kind > > of virtual alias at some point. > Otherwise a lot of things will break. Keep an eye on it. If need

Re: Card level differences between XAA and EXA hooks?

2012-04-10 Thread Michel Dänzer
On Fre, 2012-04-06 at 23:36 -0700, Connor Behan wrote: > I am trying to port my driver to EXA (r128 if that matters > https://bugs.freedesktop.org/show_bug.cgi?id=47866) and I've hit a brick > wall trying to make it pass rendercheck tests. Specifically, the tests I > am running are the quick on

Re: Xorg segfaults on i915gm during intel_drv.so init

2012-04-10 Thread Michal Suchanek
Hello, this worked well enough just before 1.12 when I wrote that patch but X master has changed too much I guess. Anyway, I tested with 1.12.0 and without the patch the X server crashes on reset with rotated screen. With the patch it does not crash for me but I start without rotation and only

Re: [PATCH synaptics] Replace hardcoded max number of touches with a define.

2012-04-10 Thread Chase Douglas
On 04/09/2012 10:30 PM, Peter Hutterer wrote: > Signed-off-by: Peter Hutterer > --- > no visible effect, I just need this for another patch (not ready yet) that > will make use of this. > > src/synaptics.c|2 +- > src/synapticsstr.h |1 + > 2 files changed, 2 insertions(+), 1 deletio

[RFC] xserver: rip indexes out of the API/ABI

2012-04-10 Thread Dave Airlie
Hi guys, Over the Easter break I had the idea that life would be a lot better if we didn't expose xf86Screens and screenInfo to drivers, going forward with hotplug I had some new ideas about how things might work but removing xf86Screens + screenInfo from the ABI is definitely a pre-requirement.

[PATCH 01/15] xf86: add helper functions to convert to from ScrnInfoPtr/ScreenPtr

2012-04-10 Thread Dave Airlie
These are just simple functions that we should start migrating drivers to using. The end goal is to remove xf86Screens and screenInfo from the ABI. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86.h |5 + hw/xfree86/common/xf86Helper.c | 12 2 files changed, 17

[PATCH 02/15] xf86: migrate to using xf86ScreenToScrn wrapper

2012-04-10 Thread Dave Airlie
migrate to new helper API. This just wraps all the obvious uses of xf86Screens[pScreen->myNum], and should be fairly simple to review. Signed-off-by: Dave Airlie --- glx/glxdri.c |2 +- glx/glxdri2.c |2 +- hw/xfree86/common/xf86DGA.c

[PATCH 03/15] xserver: remove index from CloseScreen (API/ABI breakage)

2012-04-10 Thread Dave Airlie
This drops the index from the CloseScreen callback, its always been useless really, since the pScreen contains it. Signed-off-by: Dave Airlie --- Xext/panoramiX.c |4 ++-- Xext/shm.c |4 ++-- Xext/xvdix.h |2

[PATCH 04/15] xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API break)

2012-04-10 Thread Dave Airlie
Instead of passing an index, pass the actual ScreenPtr. This allows more moving towards not abusing xf86Screens + screenInfo. Signed-off-by: Dave Airlie --- composite/compalloc.c |5 ++--- dix/dixutils.c |4 ++-- exa/exa.c

[PATCH 05/15] xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break)

2012-04-10 Thread Dave Airlie
This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr instead of an index into xf86Screens. This allows dropping more public dereferences of the xf86Screens and screenInfo. Signed-off-by: Dave Airlie --- glx/glxdri.c | 14 ++ glx/glxdri2.c

[PATCH 06/15] xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API)

2012-04-10 Thread Dave Airlie
Another index->pScrn conversion. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Helper.c |2 +- hw/xfree86/common/xf86VGAarbiter.c |6 +++--- hw/xfree86/common/xf86VGAarbiterPriv.h |4 ++-- hw/xfree86/common/xf86str.h|2 +- 4 files changed, 7 inserti

[PATCH 07/15] xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This converts AdjustFrame code paths to passing a ScrnInfoPtr instead of an integer index. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Cursor.c |4 ++-- hw/xfree86/common/xf86VGAarbiter.c |6 +++--- hw/xfree86/common/xf86VGAarbiterPriv.h |4 ++-- hw/xfree86/commo

[PATCH 08/15] xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrate the SwitchMode interface to take a ScrnInfoPtr instead of an index. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Cursor.c |2 +- hw/xfree86/common/xf86VGAarbiter.c |6 +++--- hw/xfree86/common/xf86VGAarbiterPriv.h |4 ++-- hw/xfree86/common/xf86cmap.c

[PATCH 09/15] xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrates the ValidMode to passing a ScrnInfoPtr instead of an index. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Mode.c |4 ++-- hw/xfree86/common/xf86str.h |2 +- hw/xfree86/doc/ddxDesign.xml |2 +- hw/xfree86/fbdevhw/fbdevhw.c |4 +--- hw/xfree86/

[PATCH 10/15] xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)

2012-04-10 Thread Dave Airlie
The EXA interface migrates to ScreenPtr, and the xf86 interface migrated to ScrnInfoPtr. Signed-off-by: Dave Airlie --- exa/exa.h |2 +- exa/exa_offscreen.c|4 +--- exa/exa_priv.h |2 +- hw/xfree86/common/xf86.h |2 +- hw/xfr

[PATCH 11/15] xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrates the ChangeGamma interface to avoid passing a index. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86cmap.c |5 ++--- hw/xfree86/common/xf86str.h |2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86

[PATCH 12/15] xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrates the SetDGAMode callback from an index to ScrnInfoPtr. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86DGA.c | 10 -- hw/xfree86/common/xf86cmap.c | 12 ++-- hw/xfree86/common/xf86str.h |2 +- hw/xfree86/xaa/xaaInit.c |8 hw/xfree86/xa

[PATCH 13/15] xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrates the PMEvent from index to ScrnInfoPtr. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86PM.c |6 +++--- hw/xfree86/common/xf86str.h |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index c8fd8

[PATCH 14/15] xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
This migrates PointerMoved from an index to ScrnInfoPtr. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Cursor.c |7 +++ hw/xfree86/common/xf86str.h|2 +- hw/xfree86/modes/xf86RandR12.c |5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/xfree86/

[PATCH 15/15] xserver: drop index argument to ScreenInit (ABI/API)

2012-04-10 Thread Dave Airlie
This drops the index argument, its the same as pScreen->myNum, and its the last major index abuse I can find. Signed-off-by: Dave Airlie --- dix/dispatch.c |5 ++--- hw/dmx/dmxextension.c|2 +- hw/dmx/dmxscrinit.c | 16 hw/dmx/dmxscrinit.

[PATCH] xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)

2012-04-10 Thread Dave Airlie
This migrates the ChangeGamma interface to avoid passing a index. v2: fix xf86RandR12.c + xf86cmap.c call Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86cmap.c |9 - hw/xfree86/common/xf86str.h|2 +- hw/xfree86/modes/xf86RandR12.c |3 +-- 3 files changed, 6 inser

Re: [PATCH 04/15] xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API break)

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > Instead of passing an index, pass the actual ScreenPtr. This allows > more moving towards not abusing xf86Screens + screenInfo. > > Signed-off-by: Dave Airlie This should include the matching doc update: diff --git a/doc/Xserver-spec.xml b/doc/Xserver-

Re: Xorg segfaults on i915gm during intel_drv.so init

2012-04-10 Thread Michal Suchanek
On 10 April 2012 15:56, Michal Suchanek wrote: > Hello, > > this worked well enough just before 1.12 when I wrote that patch  but > X master has changed too much I guess. > > Anyway, I tested with 1.12.0 and without the patch the X server > crashes on reset with rotated screen. > > With the patch

Re: [PATCH 06/15] xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API)

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > Another index->pScrn conversion. > > Signed-off-by: Dave Airlie > --- > hw/xfree86/common/xf86Helper.c |2 +- > hw/xfree86/common/xf86VGAarbiter.c |6 +++--- > hw/xfree86/common/xf86VGAarbiterPriv.h |4 ++-- > hw/xfree86/common/x

Re: [PATCH 07/15] xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API)

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > This converts AdjustFrame code paths to passing a ScrnInfoPtr > instead of an integer index. > > Signed-off-by: Dave Airlie > --- > hw/xfree86/common/xf86Cursor.c |4 ++-- > hw/xfree86/common/xf86VGAarbiter.c |6 +++--- > hw/xfree86/

Re: libX11: Changes to 'master'

2012-04-10 Thread Pander
On 2012-04-09 18:21, Julien Cristau wrote: > On Wed, Apr 4, 2012 at 13:28:17 +0200, Pander wrote: > >> On 2012-03-31 13:05, Julien Cristau wrote: >>> On Thu, Mar 22, 2012 at 16:36:27 +0100, Pander wrote: >>> James, Julien, did you receive enough compelling arguments to resolve this conf

Re: [PATCH 12/15] xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > This migrates the SetDGAMode callback from an index to ScrnInfoPtr. > > Signed-off-by: Dave Airlie > --- > hw/xfree86/common/xf86DGA.c | 10 -- > hw/xfree86/common/xf86cmap.c | 12 ++-- > hw/xfree86/common/xf86str.h |2 +- > hw

Re: Xorg segfaults on i915gm during intel_drv.so init

2012-04-10 Thread Michal Suchanek
Hello, maybe this patch would work (to git before reverting). Can you try on the system where X crashes on startup? I suspect that under some circumstances the damage destroy is attempted when screen is not fully initialized, and the X server crashes while calculating screenDrawable. Alternativ

Re: [PATCH 14/15] xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > -ScreenPtr pScreen = screenInfo.screens[scrnIndex]; > -ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen); > +ScreenPtr pScreen = xf86ScrnToScreen(pScrn); Should the remaining instances of XF86SCRNINFO be replaced? It appears to be roughly equivalent t

Re: [RFC] xserver: rip indexes out of the API/ABI

2012-04-10 Thread Alan Coopersmith
On 04/10/12 07:47 AM, Dave Airlie wrote: > This patch series tears strips out of the current API, its not complete, > with further changes to ddc/i2c code I can remove all references to > xf86Screens from drivers. I've got a bit more work to stop them > peaking inside screenInfo. And of course I w

[PATCH] Xi: fix XITouchClass sourceid assignment

2012-04-10 Thread Peter Hutterer
Signed-off-by: Peter Hutterer --- Xi/xiquerydevice.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index 749bc24..15c8b2a 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -430,7 +430,7 @@ ListTouchInfo(DeviceIntPtr dev

[PATCH synaptics] Don't count fingers twice when guessing distance (#48316)

2012-04-10 Thread Peter Hutterer
A finger may be closer than the required distance to more than one finger. e.g. for fingers A, B, C, AC and BC could both trigger the check and count C twice. Avoid double-counting by marking those fingers already close enough to a previous finger to avoid overcounting. X.Org Bug 48316

[PATCH 1/3] Don't update listener after deactivating implicit pointer grab

2012-04-10 Thread Chase Douglas
After the pointer grab is deactivated, the touch listener record is updated at the end of DeliverTouchEmulatedEvent. However, the touch record is ended when the grab is deactivated, so the update to the listener record is in an array of memory that has been freed. Signed-off-by: Chase Douglas ---

[PATCH 2/3] Update event type when delivering end event to a pointer listener

2012-04-10 Thread Chase Douglas
Just like when we deliver to a touch listener, we must convert a touch end event to an update event for further clients. This also ensures that the touch record is not deleted at the end of ProcessTouchEvent(). Signed-off-by: Chase Douglas --- Xi/exevents.c |7 +++ 1 files changed, 7 ins

[PATCH 3/3] Ensure sequential touches are pointer emulated sequentially

2012-04-10 Thread Chase Douglas
Issue: * Two sequential touches (i.e. down, up, down, up) * Both are grabbed by a touch grab * Both have a second listener in the form of a pointer grab or selection * The second and first touches are rejected in that order The first touch must be pointer emulated before the second touch, so the s

Re: [PATCH] Xi: fix XITouchClass sourceid assignment

2012-04-10 Thread Chase Douglas
On 04/10/2012 04:43 PM, Peter Hutterer wrote: > Signed-off-by: Peter Hutterer > --- > Xi/xiquerydevice.c |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c > index 749bc24..15c8b2a 100644 > --- a/Xi/xiquerydevice.c > +++ b/Xi/xi

[PATCH synaptics] tools: skip non-existing properties

2012-04-10 Thread Peter Hutterer
If a property doesn't exist on a device, skip it. Signed-off-by: Peter Hutterer --- tools/synclient.c |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/synclient.c b/tools/synclient.c index 942312a..aef719f 100644 --- a/tools/synclient.c +++ b/tools/synclient

Re: [PATCH synaptics] Don't count fingers twice when guessing distance (#48316)

2012-04-10 Thread Chase Douglas
On 04/10/2012 05:03 PM, Peter Hutterer wrote: > A finger may be closer than the required distance to more than one finger. > e.g. for fingers A, B, C, AC and BC could both trigger the check and count > C twice. The above description actually results in the correct count for three touches. A better

Re: [PATCH synaptics] tools: skip non-existing properties

2012-04-10 Thread Chase Douglas
On 04/10/2012 05:21 PM, Peter Hutterer wrote: > If a property doesn't exist on a device, skip it. Does this occur normally? Or does this only happen when mixing and matching synaptics input modules and synclients? > Signed-off-by: Peter Hutterer > --- > tools/synclient.c |9 + > 1 f

Re: [PATCH synaptics] tools: skip non-existing properties

2012-04-10 Thread Peter Hutterer
On Tue, Apr 10, 2012 at 05:26:19PM -0700, Chase Douglas wrote: > On 04/10/2012 05:21 PM, Peter Hutterer wrote: > > If a property doesn't exist on a device, skip it. > > Does this occur normally? Or does this only happen when mixing and > matching synaptics input modules and synclients? happened t

Re: [PATCH synaptics] Don't count fingers twice when guessing distance (#48316)

2012-04-10 Thread Peter Hutterer
On Tue, Apr 10, 2012 at 05:24:26PM -0700, Chase Douglas wrote: > On 04/10/2012 05:03 PM, Peter Hutterer wrote: > > A finger may be closer than the required distance to more than one finger. > > e.g. for fingers A, B, C, AC and BC could both trigger the check and count > > C twice. > > The above de

Re: [PATCH xdm] Support reloading xdm through systemd.

2012-04-10 Thread Alan Coopersmith
On 04/10/12 12:16 AM, Michał Górny wrote: > On Fri, 30 Dec 2011 15:20:25 -0500 > Gaetan Nadon wrote: > >>> In the meantime, currently the officially supported way of doing >>> this is through calling /bin/kill. Maybe it will become some kind >>> of virtual alias at some point. >> Otherwise a lot

Re: [PATCH synaptics] Don't count fingers twice when guessing distance (#48316)

2012-04-10 Thread Chase Douglas
On 04/10/2012 06:14 PM, Peter Hutterer wrote: > On Tue, Apr 10, 2012 at 05:24:26PM -0700, Chase Douglas wrote: >> On 04/10/2012 05:03 PM, Peter Hutterer wrote: >>> A finger may be closer than the required distance to more than one finger. >>> e.g. for fingers A, B, C, AC and BC could both trigger t

Re: [PATCH 14/15] xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)

2012-04-10 Thread Dave Airlie
On Tue, Apr 10, 2012 at 10:05 PM, Alan Coopersmith wrote: > On 04/10/12 07:47 AM, Dave Airlie wrote: >> -    ScreenPtr pScreen = screenInfo.screens[scrnIndex]; >> -    ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen); >> +    ScreenPtr pScreen = xf86ScrnToScreen(pScrn); > > Should the remaining instances