Re: [PATCH] remove dead code in dummy driver

2016-09-21 Thread Aaron Plattner 
On 09/20/2016 02:07 AM, Eric Engestrom wrote:
> On Tue, Sep 20, 2016 at 01:34:40PM +0700, Antoine Martin wrote:
>> Signed-off-by: Antoine Martin 
> 
> Reviewed-by: Eric Engestrom 

Looks good to me too (although I'm cheating since this chunk is identical to 
part of https://patchwork.freedesktop.org/patch/41058/)

Pushed:
remote: Updating patchwork state for 
https://patchwork.freedesktop.org/project/Xorg/list/
remote: I: patch #111435 updated using rev 
367c778240b4266958f33cec3653d5389e283557.
remote: I: 1 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-dummy
   8706f60ab457..367c778240b4  HEAD -> master

>> ---
>>  src/dummy_driver.c | 19 ---
>>  1 file changed, 19 deletions(-)
>>
>> diff --git a/src/dummy_driver.c b/src/dummy_driver.c
>> index c84000f..ec1acf3 100644
>> --- a/src/dummy_driver.c
>> +++ b/src/dummy_driver.c
>> @@ -700,25 +700,6 @@ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
>>  void
>>  DUMMYAdjustFrame(ADJUST_FRAME_ARGS_DECL)
>>  {
>> -SCRN_INFO_PTR(arg);
>> -int Base; 
>> -
>> -Base = (y * pScrn->displayWidth + x) >> 2;
>> -
>> -/* Scale Base by the number of bytes per pixel. */
>> -switch (pScrn->depth) {
>> -case  8 :
>> -break;
>> -case 15 :
>> -case 16 :
>> -Base *= 2;
>> -break;
>> -case 24 :
>> -Base *= 3;
>> -break;
>> -default :
>> -break;
>> -}
>>  }
>>  
>>  /* Mandatory */
>> -- 
>> 2.7.4

___
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: [PULL] Windows-DRI extension

2016-09-21 Thread Eric Anholt 
Emil Velikov  writes:

> On 16 September 2016 at 17:46, Eric Anholt  wrote:
>> Emil Velikov  writes:
>>
>>> On 15 September 2016 at 20:12, Jon Turney  
>>> wrote:
 On 15/09/2016 14:14, Emil Velikov wrote:
>
> On 15 September 2016 at 13:06, Jon Turney wrote:
>>
>> Please consider pulling into master.
>>
>> The following changes since commit
>> 52d6a1e832a5e62289dd4f32824ae16a78dfd7e8:
>>
>>   Hold input lock for deviceProc (2016-09-15 07:50:38 +1000)
>>
>> are available in the git repository at:
>>
>>   git://people.freedesktop.org/~jturney/xserver
>>
>> for you to fetch changes up to 7280a41ef26647c27035e51e33c6f3ac5b12e931:
>>
>>   Add Windows-DRI extension (2016-09-15 12:53:21 +0100)
>>
> Was meaning to mention this (mesa patches to be precise) but other
> things keep on popping:
>
> Where can one find the windowsdriproto package/repo that this depends on ?


 Like appledriproto, the headers and .pc currently live in mesa (under
 src/glx/windows) and are installed by that.

>>> I'm pretty sure I mentioned/suggested the same thing for appledriproto
>>> as well ;-)
>>>
 I did consider giving it an independent existence, but I'm not sure if
 that's wanted: there seemed to be a feeling that there are already too many
 proto repos, and it's not like these proto headers are likely to be used by
 anything else.

>>> If people are afraid of "too many" proto repos, they always will be -
>>> it makes no difference here. Yes, those are not be used by anything
>>> else (atm) yet one shouldn't "clump" things based on that merit alone,
>>> no ?
>>
>> The solution to too many proto repos is to be using xcb instead.
> Speaking of which: did you have the chance to look into/implement
> "event filtering" to bring XCB on part with Xlib in that department ?
>
> I'm thinking about (the comment in) this 3+yo commit [1].

No, but that's completely unrelated.


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

Re: [PATCH 1/1] dix: Make InitCoreDevices() failures more verbose.

2016-09-21 Thread Peter Hutterer 
On Mon, Sep 19, 2016 at 01:13:02AM -0700, Jeremy Huddleston Sequoia wrote:
> Signed-off-by: Jeremy Huddleston Sequoia 

stop taking the mystery out of life! :)
low impact, so I figured we might as well push that in now.

   5794bdd..d0c5d20  master -> master

Cheers,
   Peter

> ---
>  dix/devices.c | 37 ++---
>  1 file changed, 26 insertions(+), 11 deletions(-)
> 
> diff --git a/dix/devices.c b/dix/devices.c
> index 56aae85..ea3c6c8 100644
> --- a/dix/devices.c
> +++ b/dix/devices.c
> @@ -709,17 +709,32 @@ CorePointerProc(DeviceIntPtr pDev, int what)
>  void
>  InitCoreDevices(void)
>  {
> -if (AllocDevicePair(serverClient, "Virtual core",
> -, ,
> -CorePointerProc, CoreKeyboardProc, TRUE) != Success)
> - FatalError("Failed to allocate core devices");
> -
> -if (ActivateDevice(inputInfo.pointer, TRUE) != Success ||
> -ActivateDevice(inputInfo.keyboard, TRUE) != Success)
> - FatalError("Failed to activate core devices.");
> -if (!EnableDevice(inputInfo.pointer, TRUE) ||
> -!EnableDevice(inputInfo.keyboard, TRUE))
> - FatalError("Failed to enable core devices.");
> +int result;
> +
> +result = AllocDevicePair(serverClient, "Virtual core",
> + , ,
> + CorePointerProc, CoreKeyboardProc, TRUE);
> +if (result != Success) {
> +FatalError("Failed to allocate virtual core devices: %d", result);
> +}
> +
> +result = ActivateDevice(inputInfo.pointer, TRUE);
> +if (result != Success) {
> +FatalError("Failed to activate virtual core pointer: %d", result);
> +}
> +
> +result = ActivateDevice(inputInfo.keyboard, TRUE);
> +if (result != Success) {
> +FatalError("Failed to activate virtual core keyboard: %d", result);
> +}
> +
> +if (!EnableDevice(inputInfo.pointer, TRUE)) {
> + FatalError("Failed to enable virtual core pointer.");
> +}
> +
> +if (!EnableDevice(inputInfo.keyboard, TRUE)) {
> + FatalError("Failed to enable virtual core keyboard.");
> +}
>  
>  InitXTestDevices();
>  }
> -- 
> 2.10.0 (Apple Git-77)
> 
> ___
> 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 xf86-input-libinput] Fix --with-xorg-conf-dir default value

2016-09-21 Thread Peter Hutterer 
On Wed, Sep 21, 2016 at 04:17:00PM +0900, Michel Dänzer wrote:
> On 21/09/16 03:49 PM, Peter Hutterer wrote:
> > On Fri, Sep 16, 2016 at 05:26:06PM +0900, Michel Dänzer wrote:
> >> From: Michel Dänzer 
> >>
> >> If --prefix isn't specified on the command line, $prefix contains "NONE"
> >> at this point, not the default prefix value. So make install would
> >> attempt to install the xorg.conf.d snippet to
> >> ${DESTDIR}NONE/share/X11/xorg.conf.d/.
> >>
> >> Avoid this by leaving ${prefix} verbatim in the default value, to be
> >> resolved by make.
> >>
> >> Signed-off-by: Michel Dänzer 
> > 
> > what system was this on?
> 
> Debian sid with autoconf 2.69.
> 
> 
> > my fedora here seems to fill in the /usr/local prefix automatically
> > and early enough that this isn't an issue.
> 
> Can you find out where that happens for you?
> 
> Grepping for xNONE in /usr/share/autoconf here, I find that AC_OUTPUT in
> /usr/share/autoconf/autoconf/status.m4 checks for $prefix containing
> NONE and assigns $ac_default_prefix to it in that case. There are other
> macros which check for NONE and use $ac_default_prefix in that case.

can't quite find where it's expanded but after digging through the generated
configure script I concur with the commit message. so...

  b87d253..0cfe9ec  master -> master

thanks

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

Re: [PATCH] xkb: fix turbo-repeat of RedirectKey-ed keysyms

2016-09-21 Thread Peter Hutterer 
On Wed, Sep 14, 2016 at 11:47:15AM +0100, Daniel Stone wrote:
> From: Mihail Konev 
> 
> RedirectKey() action had been broken by commit 2e6190.
> A dropped check caused over-intense autorepeat of keysyms enriched
> with the action.
> 
> Previous to this commit, the check wrapped the entire switch() block,
> which was dropped with the move to a separate function.
> 
> Restore the checking.
> 
> Signed-off-by: Mihail Konev 
> Reviewed-by: Daniel Stone 


merged and pushed, thanks

Cheers,
   Peter

> ---
>  xkb/xkbActions.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
> index 048ed44..2ffd3fa 100644
> --- a/xkb/xkbActions.c
> +++ b/xkb/xkbActions.c
> @@ -1337,7 +1337,8 @@ XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, 
> DeviceEvent *event)
>  }
>  
>  sendEvent = _XkbApplyFilters(xkbi, key, );
> -XkbActionGetFilter(dev, event, key, , );
> +if (sendEvent)
> +XkbActionGetFilter(dev, event, key, , );
>  }
>  else {
>  if (!keyEvent)
> -- 
> 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

Re: [PATCH xf86-input-libinput] Fix --with-xorg-conf-dir default value

2016-09-21 Thread Michel Dänzer 
On 21/09/16 03:49 PM, Peter Hutterer wrote:
> On Fri, Sep 16, 2016 at 05:26:06PM +0900, Michel Dänzer wrote:
>> From: Michel Dänzer 
>>
>> If --prefix isn't specified on the command line, $prefix contains "NONE"
>> at this point, not the default prefix value. So make install would
>> attempt to install the xorg.conf.d snippet to
>> ${DESTDIR}NONE/share/X11/xorg.conf.d/.
>>
>> Avoid this by leaving ${prefix} verbatim in the default value, to be
>> resolved by make.
>>
>> Signed-off-by: Michel Dänzer 
> 
> what system was this on?

Debian sid with autoconf 2.69.


> my fedora here seems to fill in the /usr/local prefix automatically
> and early enough that this isn't an issue.

Can you find out where that happens for you?

Grepping for xNONE in /usr/share/autoconf here, I find that AC_OUTPUT in
/usr/share/autoconf/autoconf/status.m4 checks for $prefix containing
NONE and assigns $ac_default_prefix to it in that case. There are other
macros which check for NONE and use $ac_default_prefix in that case.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer
___
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 xf86-input-libinput] Fix --with-xorg-conf-dir default value

2016-09-21 Thread Peter Hutterer 
On Fri, Sep 16, 2016 at 05:26:06PM +0900, Michel Dänzer wrote:
> From: Michel Dänzer 
> 
> If --prefix isn't specified on the command line, $prefix contains "NONE"
> at this point, not the default prefix value. So make install would
> attempt to install the xorg.conf.d snippet to
> ${DESTDIR}NONE/share/X11/xorg.conf.d/.
> 
> Avoid this by leaving ${prefix} verbatim in the default value, to be
> resolved by make.
> 
> Signed-off-by: Michel Dänzer 

what system was this on? my fedora here seems to fill in the /usr/local prefix
automatically and early enough that this isn't an issue. So I'm wondering if
this a temporary configure bug on your box or a general issue?

Cheers,
   Peter

> ---
>  configure.ac | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 4c72c75..4158e57 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -58,9 +58,9 @@ AC_SUBST(inputdir)
>  
>  AC_ARG_WITH(xorg-conf-dir,
>  AC_HELP_STRING([--with-xorg-conf-dir=DIR],
> -   [Default xorg.conf.d directory 
> [[default=$prefix/share/X11/xorg.conf.d/]]]),
> +   [Default xorg.conf.d directory 
> [[default=${prefix}/share/X11/xorg.conf.d]]]),
>  [xorgconfdir="$withval"],
> -[xorgconfdir="$prefix/share/X11/xorg.conf.d"])
> +[xorgconfdir='${prefix}/share/X11/xorg.conf.d'])
>  AC_SUBST(xorgconfdir)
>  
>  # X Server SDK location is required to install header files
> -- 
> 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