Re: Ubuntu PRIME switching problems

2017-02-16 Thread Michel Dänzer 
On 16/02/17 05:17 PM, Francesco Cammelli wrote:
> 
> DRI_PRIME=1 0ad
> 
> To try it on the famous linux videogame 0 A.D., but I had a black screen

That sounds like Xorg crashes? Can you provide the Xorg.*.log(.old) file
from the crashed Xorg?

If you try

 DRI_PRIME=1 LIBGL_DEBUG=verbose glxinfo &>/tmp/glxinfo.txt

does that also cause a black screen? Please provide the contents of the
/tmp/glxinfo.txt file it generates.


> with this message
> http://www.imagestime.com/imageshow.php/1100381_IMG20170210144420.jpg
> I have no idea of what it could be, the only thing I remember is that on
> Ubuntu 14.04 I had to fix a brightness problem, which I resolved
> changing something in that folder (I think).

Looks like the message is related to that, but harmless; it's just what
happens to become visible when Xorg presumably crashes.


> And you can see two error point: " VCE init error (-22)" and the other
> "*ERROR* Cannot find a backlight controller"

These might be harmless as well.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer
___
xorg@lists.x.org: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: https://lists.x.org/mailman/listinfo/xorg
Your subscription address: %(user_address)s

[PULL xserver 1.19] intel happy go crashy fixes

2017-02-16 Thread Peter Hutterer 
Improves the user experience by not crashing frequently. The fixes aren't
intel-specific per-se, but only that driver seems to trigger them. See
https://bugs.freedesktop.org/show_bug.cgi?id=99358

This are for 1.19.2, s per subject

Cheers,
   Peter

The following changes since commit ad2facda30f453d749492c51d29f2626aee6326a:

  xserver 1.19.1 (2017-01-11 16:15:57 -0500)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver server-1.19-branch

for you to fetch changes up to 9a9c6af22e0f0136b11d7c19ce06c48e720a9ca4:

  xfree86: Take input_lock() for xf86ScreenCheckHWCursor (2017-02-17 10:14:03 
+1000)


Chris Wilson (3):
  xfree86: Take the input lock for xf86RecolorCursor
  xfree86: Take input lock for xf86TransparentCursor
  xfree86: Take input_lock() for xf86ScreenCheckHWCursor

 hw/xfree86/ramdac/xf86HWCurs.c | 55 --
 1 file changed, 42 insertions(+), 13 deletions(-)


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xim] Send screen number

2017-02-16 Thread Takao Fujiwara 

Hi,
I'm a maintainer of IBus which is an input method framework.
Xorg ZaphodHeads environment provides the multiple screens.
I think currently XIM protocol does not send the $DISPLAY information in the client applications to the XIM server and IBus cannot know the screen  
number of the client applications.


The following patch can send the client DISPLAY information to the XIM server:

https://github.com/fujiwarat/libX11/commits/xim-screen-number

Could you evaluate the patch?
Fujiwara
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver] sdksyms: Tighten up the symbols we add to the magic table

2017-02-16 Thread Peter Hutterer 
On Thu, Feb 16, 2017 at 02:00:03PM -0500, Adam Jackson wrote:
> The code as written would match anything declared extern. _X_EXPORT is
> what we really mean here. That's a macro, so check for what it expands
> to and skip if not found.
> 
> Signed-off-by: Adam Jackson 
> ---
>  hw/xfree86/sdksyms.sh | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
> index cf26892..10909d0 100755
> --- a/hw/xfree86/sdksyms.sh
> +++ b/hw/xfree86/sdksyms.sh
> @@ -343,6 +343,10 @@ BEGIN {
> n = 1;
>  }
>  
> +# only match _X_EXPORT
> +if ($n !~ /^(__attribute__..visibility..default|__global)/)
> +next;

Reviewed-by: Peter Hutterer 

> +
>   # skip attribute, if any
>   while ($n ~ /^(__attribute__|__global)/ ||
>   # skip modifiers, if any

fwiw, just a line below here there's still a mention of _X_EXPORT which is
a noop:

  $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||

feel free to remove that one with my rev-by.

Cheers,
   Peter
 
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Ubuntu PRIME switching problems

2017-02-16 Thread Francesco Cammelli 

Dear Experts

I write to you as an ignorant user of Linux. I had problems with my 
laptop in order to switch from the AMD APU to the dedicated Radeon GPU: 
I asked on Ubuntu ask, and nobody answered, I asked on Ubuntu global 
forum, and nobody answered; I asked on Italian ubuntu community forum, 
and nobody answered.

So I hope you answer me, just to know why I have this problem
The problem is that one


I had that problem on Ubuntu 14.04, and I never have been able to 
resolve it. Now, on Ubuntu 16.04, I think I would find a solution: i 
can't switch from APU A4-6210 to the dedicated graphic card AMD Radeon 
HD 8570M. Using PRIME as described on the Italian community guide. i put 
the command



xrandr --listproviders

and it gives to me that:

Providers: number : 3
Provider 0: id: 0x74 cap: 0x9, Source Output, Sink Offload crtcs: 2 outputs: 3 
associated providers: 2 name:MULLINS @ pci::00:01.0
Provider 1: id: 0x3f cap: 0x6, Sink Output, Source Offload crtcs: 0 outputs: 0 
associated providers: 2 name:HAINAN @ pci::01:00.0
Provider 2: id: 0x3f cap: 0x6, Sink Output, Source Offload crtcs: 0 outputs: 0 
associated providers: 2 name:HAINAN @ pci::01:00.0

So I can see my APU (Mullins) but *TWO* (?) Radeon (Hainan) Goning on 
with the guide, i put the IDs of the two graphic cards (0x74 e 0x3f) and 
I tried to start some programs with the Radeon. Giving the command


DRI_PRIME=1 0ad

To try it on the famous linux videogame 0 A.D., but I had a black screen 
with this message

http://www.imagestime.com/imageshow.php/1100381_IMG20170210144420.jpg
I have no idea of what it could be, the only thing I remember is that on 
Ubuntu 14.04 I had to fix a brightness problem, which I resolved 
changing something in that folder (I think).


I also tried to give this command

francesco@Francesco:~$ dmesg | egrep 'drm|radeon'
[2.093014] [drm] Initialized drm 1.1.0 20060810
[2.162969] [drm] radeon kernel modesetting enabled.
[2.175086] fb: switching to radeondrmfb from EFI VGA
[2.175767] [drm] initializing kernel modesetting (MULLINS 0x1002:0x9850 
0x103C:0x22CE).
[2.175791] [drm] register mmio base: 0xF0F0
[2.175793] [drm] register mmio size: 262144
[2.175803] [drm] doorbell mmio base: 0xF000
[2.175806] [drm] doorbell mmio size: 8388608
[2.175814] [drm] ACPI VFCT contains a BIOS for 00:01.0 1002:9850, size 60416
[2.175978] radeon :00:01.0: VRAM: 512M 0x - 
0x1FFF (512M used)
[2.175983] radeon :00:01.0: GTT: 2048M 0x2000 - 
0x9FFF
[2.175986] [drm] Detected VRAM RAM=512M, BAR=256M
[2.175989] [drm] RAM width 128bits DDR
[2.176415] [drm] radeon: 512M of VRAM memory ready
[2.176418] [drm] radeon: 2048M of GTT memory ready.
[2.176443] [drm] Loading mullins Microcode
[2.178545] [drm] Internal thermal controller without fan control
[2.179442] [drm] radeon: dpm initialized
[2.181906] [drm] Found VCE firmware/feedback version 40.2.2 / 15!
[2.184388] [drm] GART: num cpu pages 524288, num gpu pages 524288
[2.218985] [drm] PCIE GART of 2048M enabled (table at 0x00324000).
[2.219202] radeon :00:01.0: WB enabled
[2.219222] radeon :00:01.0: fence driver on ring 0 use gpu addr 
0x2c00 and cpu addr 0x880035765c00
[2.219227] radeon :00:01.0: fence driver on ring 1 use gpu addr 
0x2c04 and cpu addr 0x880035765c04
[2.219232] radeon :00:01.0: fence driver on ring 2 use gpu addr 
0x2c08 and cpu addr 0x880035765c08
[2.219236] radeon :00:01.0: fence driver on ring 3 use gpu addr 
0x2c0c and cpu addr 0x880035765c0c
[2.219240] radeon :00:01.0: fence driver on ring 4 use gpu addr 
0x2c10 and cpu addr 0x880035765c10
[2.219743] radeon :00:01.0: fence driver on ring 5 use gpu addr 
0x00076c98 and cpu addr 0xc90001036c98
[2.219940] radeon :00:01.0: fence driver on ring 6 use gpu addr 
0x2c18 and cpu addr 0x880035765c18
[2.219945] radeon :00:01.0: fence driver on ring 7 use gpu addr 
0x2c1c and cpu addr 0x880035765c1c
[2.219950] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[2.219952] [drm] Driver supports precise vblank timestamp query.
[2.220012] radeon :00:01.0: radeon: using MSI.
[2.220052] [drm] radeon: irq initialized.
[2.224128] [drm] ring test on 0 succeeded in 3 usecs
[2.224225] [drm] ring test on 1 succeeded in 2 usecs
[2.224244] [drm] ring test on 2 succeeded in 2 usecs
[2.224464] [drm] ring test on 3 succeeded in 4 usecs
[2.224473] [drm] ring test on 4 succeeded in 4 usecs
[2.250323] [drm] ring test on 5 succeeded in 2 usecs
[2.250339] [drm] UVD initialized successfully.
[2.359548] [drm] ring test on 6 succeeded in 12 usecs
[2.359560] [drm] ring test on 7 succeeded in 2 usecs
[2.359562] [drm] VCE initialized

Re: Have keyboard events "bypass" grabbed pointer

2017-02-16 Thread Thomas Lübking 
Am Thu, 16 Feb 2017 09:27:32 +1000
schrieb Peter Hutterer :

> find documentation for xlib, that's usually quite ok for these bits
> (or the protocol directly). But yes, ReplayKeyboard ungrabs, so you
> have to immediately grab the keyboard again.

If the regrab fails, this is likely because some other client (the WM?)
grabbed the keyboard for the input. Check the status return code and
cycle regrab attempts. If they fail "too long" cancel the screenlocker
(while that's of course still a security risk, it's at least exposed)

If you've a specific setup, it's more reliable to pass down the
keypress by a side channel (dbus, or eg. alter an x property on the
root window which the WM tracks) than to open the keyboard.

Cheers,
Thomas
___
xorg@lists.x.org: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: https://lists.x.org/mailman/listinfo/xorg
Your subscription address: %(user_address)s

2017 X.Org Foundation Membership deadline for voting in the election

2017-02-16 Thread Alex Deucher 
The 2017 X.Org Foundation elections are rapidly approaching. We will
be forwarding the election schedule and nominating process to the
membership shortly.

Please note that only current members can vote in the upcoming
election, and that the deadline for new memberships or renewals to
vote in the upcoming election is 05 March 2017 at 23:59 UTC.

If you are interested in joining the X.Org Foundation or in renewing
your membership, please visit the membership system site at:
https://members.x.org/

Alex Deucher, on behalf of the X.Org elections committee
___
xorg@lists.x.org: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: https://lists.x.org/mailman/listinfo/xorg
Your subscription address: %(user_address)s

2017 X.Org Foundation Membership deadline for voting in the election

2017-02-16 Thread Alex Deucher 
The 2017 X.Org Foundation elections are rapidly approaching. We will
be forwarding the election schedule and nominating process to the
membership shortly.

Please note that only current members can vote in the upcoming
election, and that the deadline for new memberships or renewals to
vote in the upcoming election is 05 March 2017 at 23:59 UTC.

If you are interested in joining the X.Org Foundation or in renewing
your membership, please visit the membership system site at:
https://members.x.org/

Alex Deucher, on behalf of the X.Org elections committee
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver] configure.ac: use subdir-objects

2017-02-16 Thread Mihail Konev 
On Fri, Feb 17, 2017 at 04:08:45AM +0500, Mihail Konev wrote:
> Don't know whether mi/miinitext.c is better #included instead,
> sending as-is.
> 

They are all probably better included instead.
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] configure.ac: use subdir-objects

2017-02-16 Thread Mihail Konev 
automake-1.15 says:
  warning: possible forward-incompatibility.
  At least a source file is in a subdirectory, but the 'subdir-objects'
  automake option hasn't been enabled.  For now, the corresponding output
  object file(s) will be placed in the top-level directory.  However,
  this behaviour will change in future Automake versions: they will
  unconditionally cause object files to be placed in the same subdirectory
  of the corresponding sources.
  You are advised to start using 'subdir-objects' option throughout your
  project, to avoid future incompatibilities.

This fixes the "autoreconf -i" warnings.

Automake cannot (re)generate per-object '.Plo' makefile that records
the dependencies, if it is in another dir (now that the .Plo is in a
'subdirectory', i.e. ../xyz dir).
Work this around by symlinking the source files.

Signed-off-by: Mihail Konev 
---
Builds hw/ on Solaris, NetBSD, Linux, Windows, and Mac.

Don't know whether mi/miinitext.c is better #included instead,
sending as-is.

 configure.ac  |  5 +++-
 hw/dmx/.gitignore |  2 ++
 hw/dmx/Makefile.am| 10 +--
 hw/dmx/config/.gitignore  |  2 ++
 hw/dmx/config/Makefile.am | 11 ++--
 hw/kdrive/src/.gitignore  |  1 +
 hw/kdrive/src/Makefile.am |  6 -
 hw/vfb/.gitignore |  1 +
 hw/vfb/Makefile.am|  6 -
 hw/xfree86/dixmods/.gitignore |  1 +
 hw/xfree86/dixmods/Makefile.am|  6 -
 hw/xfree86/glamor_egl/.gitignore  |  2 ++
 hw/xfree86/glamor_egl/Makefile.am | 10 +--
 hw/xfree86/int10/.gitignore   |  2 ++
 hw/xfree86/int10/Makefile.am  | 11 ++--
 hw/xfree86/os-support/bsd/.gitignore  |  7 +
 hw/xfree86/os-support/bsd/Makefile.am | 43 ---
 hw/xfree86/os-support/hurd/.gitignore |  7 +
 hw/xfree86/os-support/hurd/Makefile.am| 30 -
 hw/xfree86/os-support/linux/.gitignore|  4 +++
 hw/xfree86/os-support/linux/Makefile.am   | 18 ++---
 hw/xfree86/os-support/solaris/.gitignore  |  6 +
 hw/xfree86/os-support/solaris/Makefile.am | 26 ++-
 hw/xfree86/os-support/stub/.gitignore |  8 ++
 hw/xfree86/os-support/stub/Makefile.am| 34 ++--
 hw/xfree86/utils/cvt/.gitignore   |  2 ++
 hw/xfree86/utils/cvt/Makefile.am  |  9 +--
 hw/xnest/.gitignore   |  1 +
 hw/xnest/Makefile.am  |  6 -
 hw/xquartz/.gitignore |  1 +
 hw/xquartz/Makefile.am|  6 -
 hw/xquartz/mach-startup/.gitignore|  2 +-
 hw/xquartz/mach-startup/Makefile.am   |  9 +--
 hw/xwayland/.gitignore|  3 +++
 hw/xwayland/Makefile.am   | 17 +---
 hw/xwin/.gitignore|  1 +
 hw/xwin/Makefile.am   |  9 +--
 test/.gitignore   |  1 +
 test/Makefile.am  |  6 -
 39 files changed, 271 insertions(+), 61 deletions(-)
 create mode 100644 hw/kdrive/src/.gitignore
 create mode 100644 hw/xfree86/dixmods/.gitignore
 create mode 100644 hw/xfree86/glamor_egl/.gitignore
 create mode 100644 hw/xfree86/int10/.gitignore
 create mode 100644 hw/xfree86/os-support/bsd/.gitignore
 create mode 100644 hw/xfree86/os-support/hurd/.gitignore
 create mode 100644 hw/xfree86/os-support/linux/.gitignore
 create mode 100644 hw/xfree86/os-support/solaris/.gitignore
 create mode 100644 hw/xfree86/os-support/stub/.gitignore
 create mode 100644 hw/xquartz/.gitignore

diff --git a/configure.ac b/configure.ac
index 4dcf8b5c27a0..481b28d7d239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ RELEASE_DATE="2016-11-18"
 RELEASE_NAME="Shrimp-and-grits"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign subdir-objects dist-bzip2])
 AC_USE_SYSTEM_EXTENSIONS
 
 # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in 
XORG_DEFAULT_OPTIONS
@@ -2550,6 +2550,9 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = 
xno; then
  ***])
 fi
 
+dnl Helper for subdir-objects workaround
+AC_SUBST([LN_THE_FILE], ['@echo "  LN   "$@; $(LN_S) -f $< $@'])
+
 AC_CONFIG_FILES([
 Makefile
 glx/Makefile
diff --git a/hw/dmx/.gitignore b/hw/dmx/.gitignore
index 4dd9b03580cd..d08772b4da5b 100644
--- a/hw/dmx/.gitignore
+++ b/hw/dmx/.gitignore
@@ -1,2 +1,4 @@
 #  Add & Override for this directory and it's subdirectories
 Xdmx
+panoramiX.c
+miinitext.c
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 38d6ac409e76..a0eaca511a43 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -2,8 +2,14 @@
 SUBDIRS = input config

[PATCH xserver] hw/xfree86: remove incomplete sdksyms.c on error

2017-02-16 Thread Mihail Konev 
Previously, if sdksyms.sh was failing, the incorrect sdksyms.c
would stay, breaking subsequent build attempts.

Signed-off-by: Mihail Konev 
---
Needed this on Solaris due to missing awk -> gawk symlink.

 hw/xfree86/Makefile.am | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 85bd0bed0e58..96f88cb72f66 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -137,7 +137,14 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
 EXTRA_DIST += sdksyms.sh
 
 sdksyms.dep sdksyms.c: sdksyms.sh
-   $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh 
$(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
+   $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' \
+   $(SHELL) $(srcdir)/sdksyms.sh \
+   $(top_srcdir) \
+   $(CFLAGS) \
+   $(AM_CFLAGS) \
+   $(AM_CPPFLAGS) \
+   && exit 0 ; \
+   rm sdksyms.dep sdksyms.c 2>/dev/null ; exit 1
 
 SDKSYMS_DEP = sdksyms.dep
 -include $(SDKSYMS_DEP)
-- 
2.9.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] dix: Move {Change, Copy, Destroy}Clip from GCFuncs to Screen

2017-02-16 Thread Adam Jackson 
There are only two behaviors here. Xnest and Xdmx forward the clip list
to the backing server, other DDXes use mi. But a layer like damage has
to wrap everything in the GCFuncs vtable even though it really only
cares about ValidateGC.

Since none of this varies within a screen, we can move the clip
management funcs up to the ScreenRec and eliminate the empty wrappers.

Signed-off-by: Adam Jackson 
---
 Xext/panoramiX.c   | 28 
 dix/gc.c   | 12 +--
 doc/Xserver-spec.xml   | 19 +++--
 exa/exa.c  | 39 --
 fb/fbgc.c  |  3 ---
 glamor/glamor_core.c   |  3 ---
 hw/dmx/dmx.h   |  2 ++
 hw/dmx/dmxgc.c | 24 ++---
 hw/dmx/dmxscrinit.c|  4 
 hw/xfree86/common/xf86VGAarbiter.c | 27 +--
 hw/xfree86/common/xf86VGAarbiterPriv.h |  4 
 hw/xfree86/drivers/modesetting/dri2.c  |  2 +-
 hw/xnest/GC.c  |  3 ---
 hw/xnest/Screen.c  |  3 +++
 include/gcstruct.h | 10 -
 include/scrnintstr.h   |  6 ++
 mi/mibitblt.c  |  4 ++--
 mi/migc.c  |  6 +++---
 mi/miscrinit.c |  4 
 miext/damage/damage.c  | 28 
 miext/rootless/rootlessGC.c| 30 --
 present/present.c  |  4 ++--
 render/mirect.c|  2 +-
 xfixes/region.c|  3 +--
 24 files changed, 50 insertions(+), 220 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 209df29..edd916d 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -130,13 +130,9 @@ static void XineramaValidateGC(GCPtr, unsigned long, 
DrawablePtr);
 static void XineramaChangeGC(GCPtr, unsigned long);
 static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);
 static void XineramaDestroyGC(GCPtr);
-static void XineramaChangeClip(GCPtr, int, void *, int);
-static void XineramaDestroyClip(GCPtr);
-static void XineramaCopyClip(GCPtr, GCPtr);
 
 static const GCFuncs XineramaGCFuncs = {
 XineramaValidateGC, XineramaChangeGC, XineramaCopyGC, XineramaDestroyGC,
-XineramaChangeClip, XineramaDestroyClip, XineramaCopyClip
 };
 
 #define Xinerama_GC_FUNC_PROLOGUE(pGC)\
@@ -293,30 +289,6 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr 
pGCDst)
 Xinerama_GC_FUNC_EPILOGUE(pGCDst);
 }
 
-static void
-XineramaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
-{
-Xinerama_GC_FUNC_PROLOGUE(pGC);
-(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
-Xinerama_GC_FUNC_EPILOGUE(pGC);
-}
-
-static void
-XineramaCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
-{
-Xinerama_GC_FUNC_PROLOGUE(pgcDst);
-(*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
-Xinerama_GC_FUNC_EPILOGUE(pgcDst);
-}
-
-static void
-XineramaDestroyClip(GCPtr pGC)
-{
-Xinerama_GC_FUNC_PROLOGUE(pGC);
-(*pGC->funcs->DestroyClip) (pGC);
-Xinerama_GC_FUNC_EPILOGUE(pGC);
-}
-
 int
 XineramaDeleteResource(void *data, XID id)
 {
diff --git a/dix/gc.c b/dix/gc.c
index cb8db85..f8435f1 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -340,8 +340,8 @@ ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, 
ChangeGCValPtr pUnion)
 }
 pPixmap->refcnt++;
 }
-(*pGC->funcs->ChangeClip) (pGC, pPixmap ? CT_PIXMAP : CT_NONE,
-   (void *) pPixmap, 0);
+pGC->pScreen->ChangeClip(pGC, pPixmap ? CT_PIXMAP : CT_NONE,
+ pPixmap, 0);
 break;
 case GCDashOffset:
 NEXTVAL(INT16, pGC->dashOffset);
@@ -712,7 +712,7 @@ CopyGC(GC * pgcSrc, GC * pgcDst, BITS32 mask)
 pgcDst->clipOrg.y = pgcSrc->clipOrg.y;
 break;
 case GCClipMask:
-(*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
+pgcDst->pScreen->CopyClip(pgcDst, pgcSrc);
 break;
 case GCDashOffset:
 pgcDst->dashOffset = pgcSrc->dashOffset;
@@ -770,7 +770,7 @@ FreeGC(void *value, XID gid)
 GCPtr pGC = (GCPtr) value;
 
 CloseFont(pGC->font, (Font) 0);
-(*pGC->funcs->DestroyClip) (pGC);
+pGC->pScreen->DestroyClip(pGC);
 
 if (!pGC->tileIsPixel)
 (*pGC->pScreen->DestroyPixmap) (pGC->tile.pixmap);
@@ -1022,7 +1022,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int 
nrects,
 
 if (size)
 memmove((char *) prectsNew, (char *) prects, size);
-(*pGC->funcs->ChangeClip) (pGC, newct, (void *) prectsNew, nrects);
+pGC->pScreen->ChangeClip(pGC, newct, prectsNew, nrects);
 if (pGC->funcs->ChangeGC)
 (*pGC->funcs->ChangeGC) (pGC,

Re: [PATCH xserver 5/5] mi: Add include guards to migc.h

2017-02-16 Thread Adam Jackson 
On Thu, 2017-02-16 at 14:59 -0500, Alex Deucher wrote:
> > On Thu, Feb 16, 2017 at 1:03 PM, Adam Jackson  wrote:
> > Signed-off-by: Adam Jackson 
> 
> Series is:
> Reviewed-by: Alex Deucher 

remote: I: patch #139307 updated using rev 
790c1c0b10968776440a962e1fc6d1d3157b1559.
remote: I: patch #139305 updated using rev 
706e6d9cd074da606016ed4ecff51e9c2a822087.
remote: I: patch #139306 updated using rev 
4c7d229582a97e07014091909745ac7dc4d5e93e.
remote: I: patch #139308 updated using rev 
e161853f380a0b176c81284024066cb2776136c3.
remote: I: patch #139309 updated using rev 
8b170c4447868c8d4656cf2143f009db20885f3a.
remote: I: 5 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   a6566f9..8b170c4  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

xserver 1.19.2 call for patches

2017-02-16 Thread Adam Jackson 
I'd like to do another 1.19 soonish, say middle of next week. If you've
got favorite patches you'd like to see included, please write their
sha1s on the back of a $50 bill and send them to me.

Alternatively, reply to this email, or send a pull request.

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 5/5] mi: Add include guards to migc.h

2017-02-16 Thread Alex Deucher 
On Thu, Feb 16, 2017 at 1:03 PM, Adam Jackson  wrote:
> Signed-off-by: Adam Jackson 

Series is:
Reviewed-by: Alex Deucher 

> ---
>  mi/migc.h | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/mi/migc.h b/mi/migc.h
> index 8d06a6f..add601a 100644
> --- a/mi/migc.h
> +++ b/mi/migc.h
> @@ -26,6 +26,9 @@ from The Open Group.
>
>  */
>
> +#ifndef _MIGC_H
> +#define _MIGC_H
> +
>  extern _X_EXPORT void miChangeGC(GCPtr  pGC,
>   unsigned long  mask);
>
> @@ -47,3 +50,5 @@ extern _X_EXPORT void miCopyGC(GCPtrpGCSrc,
>
>  extern _X_EXPORT void miComputeCompositeClip(GCPtr  pGC,
>   DrawablePtrpDrawable);
> +
> +#endif
> --
> 2.9.3
>
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 1/3] xfake: Remove

2017-02-16 Thread Alex Deucher 
On Thu, Feb 16, 2017 at 12:46 PM, Adam Jackson  wrote:
> We already have Xvfb for a dummy DDX.
>
> Signed-off-by: Adam Jackson 

Seems reasonable to me.  Series is:
Acked-by: Alex Deucher 

> ---
>  configure.ac   |   3 -
>  hw/kdrive/Makefile.am  |   9 +-
>  hw/kdrive/fake/.gitignore  |   2 -
>  hw/kdrive/fake/Makefile.am |  31 
>  hw/kdrive/fake/fake.c  | 444 
> -
>  hw/kdrive/fake/fake.h  | 131 -
>  hw/kdrive/fake/fakeinit.c  | 119 
>  hw/kdrive/fake/kbd.c   |  75 
>  hw/kdrive/fake/mouse.c |  64 ---
>  hw/kdrive/fake/os.c|  62 ---
>  10 files changed, 2 insertions(+), 938 deletions(-)
>  delete mode 100644 hw/kdrive/fake/.gitignore
>  delete mode 100644 hw/kdrive/fake/Makefile.am
>  delete mode 100644 hw/kdrive/fake/fake.c
>  delete mode 100644 hw/kdrive/fake/fake.h
>  delete mode 100644 hw/kdrive/fake/fakeinit.c
>  delete mode 100644 hw/kdrive/fake/kbd.c
>  delete mode 100644 hw/kdrive/fake/mouse.c
>  delete mode 100644 hw/kdrive/fake/os.c
>
> diff --git a/configure.ac b/configure.ac
> index 4dcf8b5..f801858 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -655,7 +655,6 @@ AC_ARG_ENABLE(glamor, 
> AS_HELP_STRING([--enable-glamor], [Build glamor di
>  dnl kdrive and its subsystems
>  AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build 
> kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
>  AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
> kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
> -AC_ARG_ENABLE(xfake,  AS_HELP_STRING([--enable-xfake], [Build the 
> kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
>  AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the 
> kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], 
> [XFBDEV=auto])
>  dnl kdrive options
>  AC_ARG_ENABLE(kdrive-evdev,   AS_HELP_STRING([--enable-kdrive-evdev], [Build 
> evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], 
> [KDRIVE_EVDEV=auto])
> @@ -2471,7 +2470,6 @@ AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
>  AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
>  AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
>  AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test 
> "x$KDRIVEFBDEVLIB" = xyes])
> -AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = 
> xyes])
>
>  dnl Xwayland DDX
>
> @@ -2652,7 +2650,6 @@ hw/xquartz/xpr/Makefile
>  hw/kdrive/Makefile
>  hw/kdrive/ephyr/Makefile
>  hw/kdrive/ephyr/man/Makefile
> -hw/kdrive/fake/Makefile
>  hw/kdrive/fbdev/Makefile
>  hw/kdrive/linux/Makefile
>  hw/kdrive/src/Makefile
> diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
> index 471ca89..eee3f0c 100644
> --- a/hw/kdrive/Makefile.am
> +++ b/hw/kdrive/Makefile.am
> @@ -2,10 +2,6 @@ if BUILD_KDRIVEFBDEVLIB
>  FBDEV_SUBDIRS = fbdev
>  endif
>
> -if XFAKESERVER
> -XFAKE_SUBDIRS = fake
> -endif
> -
>  if XEPHYR
>  XEPHYR_SUBDIRS = ephyr
>  endif
> @@ -16,15 +12,14 @@ endif
>
>  SERVER_SUBDIRS =   \
> $(FBDEV_SUBDIRS)\
> -   $(XEPHYR_SUBDIRS)   \
> -   $(XFAKE_SUBDIRS)
> +   $(XEPHYR_SUBDIRS)
>
>  SUBDIRS =  \
> src \
> $(LINUX_SUBDIRS)\
> $(SERVER_SUBDIRS)
>
> -DIST_SUBDIRS = fbdev ephyr src linux fake
> +DIST_SUBDIRS = fbdev ephyr src linux
>
>  relink:
> $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || 
> exit 1 ; done
> diff --git a/hw/kdrive/fake/.gitignore b/hw/kdrive/fake/.gitignore
> deleted file mode 100644
> index 12a25cc..000
> --- a/hw/kdrive/fake/.gitignore
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -#  Add & Override for this directory and it's subdirectories
> -Xfake
> diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
> deleted file mode 100644
> index d28bd27..000
> --- a/hw/kdrive/fake/Makefile.am
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -AM_CPPFLAGS =  \
> -   @KDRIVE_INCS@   \
> -   @KDRIVE_CFLAGS@
> -
> -noinst_LTLIBRARIES = libfake.la
> -
> -bin_PROGRAMS = Xfake
> -
> -libfake_la_SOURCES =   \
> -   fake.c  \
> -   kbd.c   \
> -   os.c\
> -   mouse.c \
> -   fake.h
> -
> -Xfake_SOURCES = \
> -   fakeinit.c
> -
> -Xfake_LDADD =  \
> -   libfake.la  \
> -   @KDRIVE_MAIN_LIB@   \
> -   @KDRIVE_LIBS@
> -
> -Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
> -
> -Xfake_DEPENDENCIES =   \
> -   libfake.la  \
> -

Re: [PATCH xserver] prime: Clear PixmapDirtyUpdateRec::damage when it's destroyed

2017-02-16 Thread Adam Jackson 
On Thu, 2017-02-16 at 16:13 +0900, Michel Dänzer wrote:
> > From: Michel Dänzer 
> 
> The root window, and by extension any damage records referencing it,
> may be destroyed before shared pixmaps referencing it, which resulted in
> use-after-free / double-free in PixmapStopDirtyTracking.
> 
> Fixes: b5b292896f64 ("prime: Sync shared pixmap from root window instead of 
> screen pixmap")
> Signed-off-by: Michel Dänzer 

Looks good, thanks!

remote: I: patch #139161 updated using rev 
a6566f9e4dbf9ea9568a14e22cb5d004e10dbd4d.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   371ff0c..a6566f9  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver] xwayland: bump wayland-protocols version to 1.7

2017-02-16 Thread Adam Jackson 
On Thu, 2017-02-16 at 10:43 +0100, Olivier Fourdan wrote:
> Xwayland support for pointer locking in confinement requires
> wayland-protocols version 1.7 or later.
> 
> Update the required version in configure.ac to match the minimal
> required version of wayland-protocols.
> 
> Signed-off-by: Olivier Fourdan 

remote: I: patch #139173 updated using rev 
371ff0c969a38a0013688391bbd7375bc7b6f933.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   5d29b49..371ff0c  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] sdksyms: Tighten up the symbols we add to the magic table

2017-02-16 Thread Adam Jackson 
The code as written would match anything declared extern. _X_EXPORT is
what we really mean here. That's a macro, so check for what it expands
to and skip if not found.

Signed-off-by: Adam Jackson 
---
 hw/xfree86/sdksyms.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index cf26892..10909d0 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -343,6 +343,10 @@ BEGIN {
n = 1;
 }
 
+# only match _X_EXPORT
+if ($n !~ /^(__attribute__..visibility..default|__global)/)
+next;
+
# skip attribute, if any
while ($n ~ /^(__attribute__|__global)/ ||
# skip modifiers, if any
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 1/5] wfb: Add missing rename for fbGlyphs

2017-02-16 Thread Adam Jackson 
Signed-off-by: Adam Jackson 
---
 fb/wfbrename.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index baa80f8..4c99ee5 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -74,6 +74,7 @@
 #define fbGlyph24 wfbGlyph24
 #define fbGlyph32 wfbGlyph32
 #define fbGlyph8 wfbGlyph8
+#define fbGlyphs wfbGlyphs
 #define fbHasVisualTypes wfbHasVisualTypes
 #define fbImageGlyphBlt wfbImageGlyphBlt
 #define fbIn wfbIn
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 3/5] fb: Remove unused fbGetFreeCompClip macro

2017-02-16 Thread Adam Jackson 
Signed-off-by: Adam Jackson 
---
 fb/fb.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fb/fb.h b/fb/fb.h
index d5db710..2e8770d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -462,7 +462,6 @@ typedef struct {
 
 #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 #define fbGetExpose(pGC)   ((pGC)->fExpose)
-#define fbGetFreeCompClip(pGC) ((pGC)->freeCompClip)
 #define fbGetRotatedPixmap(pGC)((pGC)->pRotatedPixmap)
 
 #define fbGetScreenPixmap(s)   ((PixmapPtr) (s)->devPrivate)
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 2/5] wfb: Hide init function decls behind FB_ACCESS_WRAPPER

2017-02-16 Thread Adam Jackson 
Signed-off-by: Adam Jackson 
---
 fb/fb.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index c687aa7..d5db710 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1192,8 +1192,8 @@ extern _X_EXPORT Bool
int dpiy, int width, /* pixel width of frame buffer */
int bpp);/* bits per pixel of frame buffer */
 
+#ifdef FB_ACCESS_WRAPPER
 extern _X_EXPORT Bool
-
 wfbFinishScreenInit(ScreenPtr pScreen,
 void *pbits,
 int xsize,
@@ -1205,7 +1205,6 @@ wfbFinishScreenInit(ScreenPtr pScreen,
 SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
 
 extern _X_EXPORT Bool
-
 wfbScreenInit(ScreenPtr pScreen,
   void *pbits,
   int xsize,
@@ -1215,9 +1214,9 @@ wfbScreenInit(ScreenPtr pScreen,
   int width,
   int bpp,
   SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
+#endif
 
 extern _X_EXPORT Bool
-
 fbFinishScreenInit(ScreenPtr pScreen,
void *pbits,
int xsize,
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 5/5] mi: Add include guards to migc.h

2017-02-16 Thread Adam Jackson 
Signed-off-by: Adam Jackson 
---
 mi/migc.h | 5 +
 1 file changed, 5 insertions(+)

diff --git a/mi/migc.h b/mi/migc.h
index 8d06a6f..add601a 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -26,6 +26,9 @@ from The Open Group.
 
 */
 
+#ifndef _MIGC_H
+#define _MIGC_H
+
 extern _X_EXPORT void miChangeGC(GCPtr  pGC,
  unsigned long  mask);
 
@@ -47,3 +50,5 @@ extern _X_EXPORT void miCopyGC(GCPtrpGCSrc,
 
 extern _X_EXPORT void miComputeCompositeClip(GCPtr  pGC,
  DrawablePtrpDrawable);
+
+#endif
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 4/5] fb: Remove stray references to fbHasVisualTypes

2017-02-16 Thread Adam Jackson 
Removed in 84e8de12.

Signed-off-by: Adam Jackson 
---
 fb/fb.h| 4 
 fb/wfbrename.h | 1 -
 2 files changed, 5 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 2e8770d..8bce67e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -900,13 +900,9 @@ extern _X_EXPORT void
  fbClearVisualTypes(void);
 
 extern _X_EXPORT Bool
- fbHasVisualTypes(int depth);
-
-extern _X_EXPORT Bool
  fbSetVisualTypes(int depth, int visuals, int bitsPerRGB);
 
 extern _X_EXPORT Bool
-
 fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
  Pixel redMask, Pixel greenMask, Pixel blueMask);
 
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 4c99ee5..b2d2ff7 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -75,7 +75,6 @@
 #define fbGlyph32 wfbGlyph32
 #define fbGlyph8 wfbGlyph8
 #define fbGlyphs wfbGlyphs
-#define fbHasVisualTypes wfbHasVisualTypes
 #define fbImageGlyphBlt wfbImageGlyphBlt
 #define fbIn wfbIn
 #define fbInitializeColormap wfbInitializeColormap
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 0/5] Five easy pieces

2017-02-16 Thread Adam Jackson 
Just some trivial fixes I've found laying around in some work-in-progress
branches.

- ajax

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 3/3] kdrive: Remove now-unused linux backend

2017-02-16 Thread Adam Jackson 
With Xfbdev gone this has no consumers.

Signed-off-by: Adam Jackson 
---
 configure.ac|  44 
 hw/kdrive/Makefile.am   |   7 +-
 hw/kdrive/linux/Makefile.am |  19 --
 hw/kdrive/linux/evdev.c | 530 
 hw/kdrive/linux/linux.c | 347 -
 hw/kdrive/linux/tslib.c | 194 
 6 files changed, 1 insertion(+), 1140 deletions(-)
 delete mode 100644 hw/kdrive/linux/Makefile.am
 delete mode 100644 hw/kdrive/linux/evdev.c
 delete mode 100644 hw/kdrive/linux/linux.c
 delete mode 100644 hw/kdrive/linux/tslib.c

diff --git a/configure.ac b/configure.ac
index da00d88..d652c86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,7 +656,6 @@ dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive 
servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
 dnl kdrive options
-AC_ARG_ENABLE(kdrive-evdev,   AS_HELP_STRING([--enable-kdrive-evdev], [Build 
evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], 
[KDRIVE_EVDEV=auto])
 AC_ARG_ENABLE(libunwind,  AS_HELP_STRING([--enable-libunwind], [Use 
libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], 
[LIBUNWIND="auto"])
 AC_ARG_ENABLE(xshmfence,  AS_HELP_STRING([--disable-xshmfence], [Disable 
xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"])
 
@@ -2366,45 +2365,6 @@ if test "$KDRIVE" = yes; then
 AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
 AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
 
-PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], 
[HAVE_TSLIB="no"])
-if test "x$HAVE_TSLIB" = xno; then
-AC_CHECK_LIB(ts, ts_open, [
-   HAVE_TSLIB="yes"
-   TSLIB_LIBS="-lts"
-   ])
-fi
-
-if test "xTSLIB" = xauto; then
-TSLIB="$HAVE_TSLIB"
-fi
-
-if test "x$TSLIB" = xyes; then
-if ! test "x$HAVE_TSLIB" = xyes; then
-AC_MSG_ERROR([tslib must be installed to build the tslib driver. 
See http://tslib.berlios.de/])
-else
-AC_DEFINE(TSLIB, 1, [Have tslib support])
-fi
-fi
-
-case $host_os in
-   *linux*)
-   KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
-KDRIVELINUX=yes
-   if test "x$KDRIVE_EVDEV" = xauto; then
-   KDRIVE_EVDEV=yes
-   fi
-   ;;
-   *)
-   if test "x$KDRIVE_EVDEV" = xauto; then
-   KDRIVE_EVDEV=no
-   fi
-   ;;
-esac
-
-if test "x$KDRIVE_EVDEV" = xyes; then
-   AC_DEFINE(KDRIVE_EVDEV, 1, [Enable KDrive evdev driver])
-fi
-
 XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil 
xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb"
 if test "x$XV" = xyes; then
 XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
@@ -2452,9 +2412,6 @@ AC_SUBST([KDRIVE_PURE_LIBS])
 AC_SUBST([KDRIVE_MAIN_LIB])
 AC_SUBST([KDRIVE_LOCAL_LIBS])
 AC_SUBST([KDRIVE_LIBS])
-AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
-AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])
-AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 
 dnl Xwayland DDX
@@ -2636,7 +2593,6 @@ hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ephyr/Makefile
 hw/kdrive/ephyr/man/Makefile
-hw/kdrive/linux/Makefile
 hw/kdrive/src/Makefile
 hw/xwayland/Makefile
 test/Makefile
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index de30e51..dc71dbd 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -2,19 +2,14 @@ if XEPHYR
 XEPHYR_SUBDIRS = ephyr
 endif
 
-if KDRIVELINUX
-LINUX_SUBDIRS = linux
-endif
-
 SERVER_SUBDIRS =   \
$(XEPHYR_SUBDIRS)
 
 SUBDIRS =  \
src \
-   $(LINUX_SUBDIRS)\
$(SERVER_SUBDIRS)
 
-DIST_SUBDIRS = ephyr src linux
+DIST_SUBDIRS = ephyr src
 
 relink:
$(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 
1 ; done
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
deleted file mode 100644
index 97c600c..000
--- a/hw/kdrive/linux/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AM_CPPFLAGS =  \
-   @KDRIVE_INCS@   \
-   @KDRIVE_CFLAGS@
-
-AM_CFLAGS = -DHAVE_DIX_CONFIG_H
-
-noinst_LTLIBRARIES = liblinux.la
-
-liblinux_la_SOURCES =
-
-liblinux_la_SOURCES += linux.c
-
-if KDRIVE_EVDEV
-liblinux_la_SOURCES += evdev.c
-endif
-
-if TSLIB
-liblinux_la_SOURCES += tslib.c
-endif
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
deleted file mode

[PATCH xserver 2/3] xfbdev: Remove

2017-02-16 Thread Adam Jackson 
With the shadow framebuffer overallocation bug fixed (ref below), Xorg +
fbdev has tens to hundreds of kilobytes more baseline memory usage than
Xfbdev. That's not nothing, but it's little enough that we should focus
our efforts on the server that actually gets development attention.

https://cgit.freedesktop.org/xorg/driver/xf86-video-fbdev/commit/?id=2c5eba8

Signed-off-by: Adam Jackson 
---
 configure.ac|  15 -
 hw/kdrive/Makefile.am   |   7 +-
 hw/kdrive/fbdev/.gitignore  |   2 -
 hw/kdrive/fbdev/Makefile.am |  30 --
 hw/kdrive/fbdev/Xfbdev.man  |  28 --
 hw/kdrive/fbdev/fbdev.c | 892 
 hw/kdrive/fbdev/fbdev.h |  99 -
 hw/kdrive/fbdev/fbinit.c| 105 --
 8 files changed, 1 insertion(+), 1177 deletions(-)
 delete mode 100644 hw/kdrive/fbdev/.gitignore
 delete mode 100644 hw/kdrive/fbdev/Makefile.am
 delete mode 100644 hw/kdrive/fbdev/Xfbdev.man
 delete mode 100644 hw/kdrive/fbdev/fbdev.c
 delete mode 100644 hw/kdrive/fbdev/fbdev.h
 delete mode 100644 hw/kdrive/fbdev/fbinit.c

diff --git a/configure.ac b/configure.ac
index f801858..da00d88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,6 @@ AC_ARG_ENABLE(glamor, 
AS_HELP_STRING([--enable-glamor], [Build glamor di
 dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive 
servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
-AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the 
kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], 
[XFBDEV=auto])
 dnl kdrive options
 AC_ARG_ENABLE(kdrive-evdev,   AS_HELP_STRING([--enable-kdrive-evdev], [Build 
evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], 
[KDRIVE_EVDEV=auto])
 AC_ARG_ENABLE(libunwind,  AS_HELP_STRING([--enable-libunwind], [Use 
libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], 
[LIBUNWIND="auto"])
@@ -2367,17 +2366,6 @@ if test "$KDRIVE" = yes; then
 AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
 AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
 
-AC_CHECK_HEADERS([linux/fb.h])
-if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then
-XFBDEV=yes
-fi
-
-if test "x$XFBDEV" = xyes; then
-KDRIVEFBDEVLIB=yes
-AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
-fi
-
-
 PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], 
[HAVE_TSLIB="no"])
 if test "x$HAVE_TSLIB" = xno; then
 AC_CHECK_LIB(ts, ts_open, [
@@ -2467,9 +2455,7 @@ AC_SUBST([KDRIVE_LIBS])
 AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
 AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])
 AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
-AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
-AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test 
"x$KDRIVEFBDEVLIB" = xyes])
 
 dnl Xwayland DDX
 
@@ -2650,7 +2636,6 @@ hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ephyr/Makefile
 hw/kdrive/ephyr/man/Makefile
-hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile
 hw/kdrive/src/Makefile
 hw/xwayland/Makefile
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index eee3f0c..de30e51 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -1,7 +1,3 @@
-if BUILD_KDRIVEFBDEVLIB
-FBDEV_SUBDIRS = fbdev
-endif
-
 if XEPHYR
 XEPHYR_SUBDIRS = ephyr
 endif
@@ -11,7 +7,6 @@ LINUX_SUBDIRS = linux
 endif
 
 SERVER_SUBDIRS =   \
-   $(FBDEV_SUBDIRS)\
$(XEPHYR_SUBDIRS)
 
 SUBDIRS =  \
@@ -19,7 +14,7 @@ SUBDIRS = \
$(LINUX_SUBDIRS)\
$(SERVER_SUBDIRS)
 
-DIST_SUBDIRS = fbdev ephyr src linux
+DIST_SUBDIRS = ephyr src linux
 
 relink:
$(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 
1 ; done
diff --git a/hw/kdrive/fbdev/.gitignore b/hw/kdrive/fbdev/.gitignore
deleted file mode 100644
index 80ad266..000
--- a/hw/kdrive/fbdev/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#  Add & Override for this directory and it's subdirectories
-Xfbdev
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
deleted file mode 100644
index d550c13..000
--- a/hw/kdrive/fbdev/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS =  \
-   @KDRIVE_INCS@   \
-   @KDRIVE_CFLAGS@
-
-noinst_LTLIBRARIES = libfbdev.la
-
-libfbdev_la_SOURCES =  \
-   fbdev.c \
-   fbdev.h
-
-if KDRIVEFBDEV
-bin_PROGRAMS = Xfbdev
-
-Xfbdev_SOURCES = \
-   fbinit.c
-
-Xfbdev_LDADD =

[PATCH xserver 1/3] xfake: Remove

2017-02-16 Thread Adam Jackson 
We already have Xvfb for a dummy DDX.

Signed-off-by: Adam Jackson 
---
 configure.ac   |   3 -
 hw/kdrive/Makefile.am  |   9 +-
 hw/kdrive/fake/.gitignore  |   2 -
 hw/kdrive/fake/Makefile.am |  31 
 hw/kdrive/fake/fake.c  | 444 -
 hw/kdrive/fake/fake.h  | 131 -
 hw/kdrive/fake/fakeinit.c  | 119 
 hw/kdrive/fake/kbd.c   |  75 
 hw/kdrive/fake/mouse.c |  64 ---
 hw/kdrive/fake/os.c|  62 ---
 10 files changed, 2 insertions(+), 938 deletions(-)
 delete mode 100644 hw/kdrive/fake/.gitignore
 delete mode 100644 hw/kdrive/fake/Makefile.am
 delete mode 100644 hw/kdrive/fake/fake.c
 delete mode 100644 hw/kdrive/fake/fake.h
 delete mode 100644 hw/kdrive/fake/fakeinit.c
 delete mode 100644 hw/kdrive/fake/kbd.c
 delete mode 100644 hw/kdrive/fake/mouse.c
 delete mode 100644 hw/kdrive/fake/os.c

diff --git a/configure.ac b/configure.ac
index 4dcf8b5..f801858 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,6 @@ AC_ARG_ENABLE(glamor, 
AS_HELP_STRING([--enable-glamor], [Build glamor di
 dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive 
servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the 
kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
-AC_ARG_ENABLE(xfake,  AS_HELP_STRING([--enable-xfake], [Build the 
kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
 AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the 
kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], 
[XFBDEV=auto])
 dnl kdrive options
 AC_ARG_ENABLE(kdrive-evdev,   AS_HELP_STRING([--enable-kdrive-evdev], [Build 
evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], 
[KDRIVE_EVDEV=auto])
@@ -2471,7 +2470,6 @@ AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test 
"x$KDRIVEFBDEVLIB" = xyes])
-AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
 
 dnl Xwayland DDX
 
@@ -2652,7 +2650,6 @@ hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ephyr/Makefile
 hw/kdrive/ephyr/man/Makefile
-hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile
 hw/kdrive/src/Makefile
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index 471ca89..eee3f0c 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -2,10 +2,6 @@ if BUILD_KDRIVEFBDEVLIB
 FBDEV_SUBDIRS = fbdev
 endif
 
-if XFAKESERVER
-XFAKE_SUBDIRS = fake
-endif
-
 if XEPHYR
 XEPHYR_SUBDIRS = ephyr
 endif
@@ -16,15 +12,14 @@ endif
 
 SERVER_SUBDIRS =   \
$(FBDEV_SUBDIRS)\
-   $(XEPHYR_SUBDIRS)   \
-   $(XFAKE_SUBDIRS)
+   $(XEPHYR_SUBDIRS)
 
 SUBDIRS =  \
src \
$(LINUX_SUBDIRS)\
$(SERVER_SUBDIRS)
 
-DIST_SUBDIRS = fbdev ephyr src linux fake
+DIST_SUBDIRS = fbdev ephyr src linux
 
 relink:
$(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 
1 ; done
diff --git a/hw/kdrive/fake/.gitignore b/hw/kdrive/fake/.gitignore
deleted file mode 100644
index 12a25cc..000
--- a/hw/kdrive/fake/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#  Add & Override for this directory and it's subdirectories
-Xfake
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
deleted file mode 100644
index d28bd27..000
--- a/hw/kdrive/fake/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AM_CPPFLAGS =  \
-   @KDRIVE_INCS@   \
-   @KDRIVE_CFLAGS@
-
-noinst_LTLIBRARIES = libfake.la
-
-bin_PROGRAMS = Xfake
-
-libfake_la_SOURCES =   \
-   fake.c  \
-   kbd.c   \
-   os.c\
-   mouse.c \
-   fake.h
-
-Xfake_SOURCES = \
-   fakeinit.c
-
-Xfake_LDADD =  \
-   libfake.la  \
-   @KDRIVE_MAIN_LIB@   \
-   @KDRIVE_LIBS@
-
-Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-
-Xfake_DEPENDENCIES =   \
-   libfake.la  \
-   @KDRIVE_LOCAL_LIBS@
-
-relink:
-   $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c
deleted file mode 100644
index 7205df4..000
--- a/hw/kdrive/fake/fake.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * Copyright © 2004 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted

Re: [PATCH 0/7] ScrnInfoRec cleanup

2017-02-16 Thread Adam Jackson 
On Tue, 2017-02-14 at 22:50 -0600, Keith Packard wrote:
> > Adam Jackson  writes:
> 
> > ScrnInfoRec is xfree86's subclass of ScreenRec. It's... showing its age.
> > Much of it is only relevant to the pre-PCI world where probing the
> > hardware was fraught with uncertainty and configuration overrides were
> > common. This is a first cut at cleaning it up a bit, mostly dropping
> > unused or under-used fields. A few of these changes (noted in the commit
> > messages) will require minor driver fixes; I'll be happy to do those
> > before merging the series.
> 
> Series is
> 
> Acked-by: Keith Packard 

Fixed up 4/7 to parse but not evaluate the BiosBase keyword, and
merged:

remote: I: patch #138931 updated using rev 
3e1a23281dd64ee7457f36208cac77c01846a28f.
remote: I: patch #138932 updated using rev 
5a945f54e738f6e9c5a489febdd8b87cd8a41210.
remote: I: patch #138934 updated using rev 
76ef102be3b47d23ebf04fb5cfc0511d43f1.
remote: E: failed to find patch for rev 
0b6f2806029493afa246b4472ee88fc173976c5a.
remote: I: patch #138935 updated using rev 
4dcf68e41857cdf78387a6232160cba5cb467fb0.
remote: I: patch #138936 updated using rev 
47db92473f7da2b7d6775ff681ec747009f8cf3f.
remote: I: patch #138937 updated using rev 
5d29b493666f728eccd8dd91992ea020bd4be9f9.
remote: I: 6 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   4c00609..5d29b49  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] xwayland: bump wayland-protocols version to 1.7

2017-02-16 Thread Olivier Fourdan 
Xwayland support for pointer locking in confinement requires
wayland-protocols version 1.7 or later.

Update the required version in configure.ac to match the minimal
required version of wayland-protocols.

Signed-off-by: Olivier Fourdan 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4dcf8b5..e291b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2475,7 +2475,7 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && 
test "x$XFAKE" = xyes])
 
 dnl Xwayland DDX
 
-XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 $LIBDRM 
epoxy"
+XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.7 $LIBDRM 
epoxy"
 if test "x$XF86VIDMODE" = xyes; then
XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
 fi
-- 
2.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel