date:20161028

[PATCH xts 1/3] xts5: Fix missing variable for format specifier

2016-10-28 Thread Rhys Kidd

XtGetKeysymTable.c:258:5: warning: format '%ld' expects a matching 'long int' 
argument [-Wformat=]

Signed-off-by: Rhys Kidd 
---
 xts5/Xt12/XtGetKeysymTable.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xts5/Xt12/XtGetKeysymTable.m b/xts5/Xt12/XtGetKeysymTable.m
index db22f1b..1d8ab91 100644
--- a/xts5/Xt12/XtGetKeysymTable.m
+++ b/xts5/Xt12/XtGetKeysymTable.m
@@ -209,7 +209,7 @@ Xlib returns to what Xt returns*/
for (i = min_keycode; i <= max_keycode; i++ ) {
if (keysym_good[i] == NoSymbol) {
if (keysym_return[i] != NoSymbol) {
-   sprintf(ebuf, "ERROR: min_keycode + %d should 
be NoSymbol, is %ld", (long)keysym_return[i]);
+   sprintf(ebuf, "ERROR: min_keycode + %d should 
be NoSymbol, is %ld", i, (long)keysym_return[i]);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-- 
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 xts 2/3] xts5: Fix missing variable for format specifier

2016-10-28 Thread Rhys Kidd

XtRemoveEventHandler.c:458:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Error message handler was invoked %d times");
   ^
XtRemoveEventHandler.c:463:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Warning message handler was invoked %d times");
   ^
XtRemoveEventHandler.c:540:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Error message handler was invoked %d times");
   ^
XtRemoveEventHandler.c:545:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Warning message handler was invoked %d times");
   ^

Signed-off-by: Rhys Kidd 
---
 xts5/Xt9/XtRemoveEventHandler.m | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xts5/Xt9/XtRemoveEventHandler.m b/xts5/Xt9/XtRemoveEventHandler.m
index 1851ef9..6e6cbbe 100644
--- a/xts5/Xt9/XtRemoveEventHandler.m
+++ b/xts5/Xt9/XtRemoveEventHandler.m
@@ -425,13 +425,13 @@ int invoked = 0;
XtAppMainLoop(app_ctext);
LKROF(pid2, AVSXTTIMEOUT-2);
tet_infoline("TEST: Error message was not emitted");
-   if (avs_get_event(3) != 0) {
-   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times");
+   if (invoked = avs_get_event(3) != 0) {
+   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-   if (avs_get_event(2) != 0) {
-   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times");
+   if (invoked = avs_get_event(2) != 0) {
+   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
@@ -491,13 +491,13 @@ int invoked = 0;
tet_result(TET_FAIL);
}
tet_infoline("TEST: Error message was not emitted");
-   if (avs_get_event(3) != 0) {
-   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times");
+   if (invoked = avs_get_event(3) != 0) {
+   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-   if (avs_get_event(2) != 0) {
-   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times");
+   if (invoked = avs_get_event(2) != 0) {
+   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-- 
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 xts 3/3] xts5: Fix missing variable for format specifier

2016-10-28 Thread Rhys Kidd

XtRemoveRawEventHandler.c:396:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Error message handler was invoked %d times");
   ^
XtRemoveRawEventHandler.c:401:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Warning message handler was invoked %d times");
   ^
XtRemoveRawEventHandler.c:478:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Error message handler was invoked %d times");
   ^
XtRemoveRawEventHandler.c:483:3: warning: format '%d' expects a matching 'int' 
argument [-Wformat=]
   sprintf(ebuf, "ERROR: Warning message handler was invoked %d times");
   ^

Signed-off-by: Rhys Kidd 
---
 xts5/Xt9/XtRemoveRawEventHandler.m | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xts5/Xt9/XtRemoveRawEventHandler.m 
b/xts5/Xt9/XtRemoveRawEventHandler.m
index 0a3f916..87dc286 100644
--- a/xts5/Xt9/XtRemoveRawEventHandler.m
+++ b/xts5/Xt9/XtRemoveRawEventHandler.m
@@ -374,13 +374,13 @@ int invoked = 0;
XtAppMainLoop(app_ctext);
LKROF(pid2, AVSXTTIMEOUT-2);
tet_infoline("TEST: Error message was not emitted");
-   if (avs_get_event(3) != 0) {
-   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times");
+   if (invoked = avs_get_event(3) != 0) {
+   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-   if (avs_get_event(2) != 0) {
-   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times");
+   if (invoked = avs_get_event(2) != 0) {
+   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
@@ -440,13 +440,13 @@ int invoked = 0;
tet_result(TET_FAIL);
}
tet_infoline("TEST: Error message was not emitted");
-   if (avs_get_event(3) != 0) {
-   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times");
+   if (invoked = avs_get_event(3) != 0) {
+   sprintf(ebuf, "ERROR: Error message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-   if (avs_get_event(2) != 0) {
-   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times");
+   if (invoked = avs_get_event(2) != 0) {
+   sprintf(ebuf, "ERROR: Warning message handler was invoked %d 
times", invoked);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-- 
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 xserver] test: Fix stray Makefile reference to removed os test

2016-10-28 Thread Keith Packard

Rhys Kidd  writes:

> Fixes the following warning:
>
> test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no program or
> test/Makefile.am:69: library has 'os' as canonical name (possible typo)
>
> Introduced upon the removal of test/os in:
>
> commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
> Author: Keith Packard 
> Date:   Tue Dec 8 14:39:46 2015 -0800
>
> Remove SIGIO support for input [v5]
>
> This removes all of the SIGIO handling support used for input
> throughout the X server, preparing the way for using threads for input
> handling instead.
>
> Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
> to stub functions input_lock/input_unlock so that we don't lose this
> information.
>
> xfree86 SIGIO support is reworked to use internal versions of
> OsBlockSIGIO and OsReleaseSIGIO.
>
> v2: Don't change locking order (Peter Hutterer)
> v3: Comment weird && FALSE in xf86Helper.c
> Leave errno save/restore in xf86ReadInput
> Squash with stub adding patch (Peter Hutterer)
> v4: Leave UseSIGIO config parameter so that
> existing config files don't break (Peter Hutterer)
> v5: Split a couple of independent patch bits out
> of kinput.c (Peter Hutterer)
>
> Signed-off-by: Keith Packard 
> Reviewed-by: Peter Hutterer 
>
> Signed-off-by: Rhys Kidd 

Reviewed-by: Keith Packard 

(we'll wait until after 1.19 to merge this to master)

-- 
-keith


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 xts] xts5: Fix format specifier type warning in XtSetSelectionTimeout

2016-10-28 Thread Rhys Kidd

XtSetSelectionTimeout.c: In function:
XtSetSelectionTimeout.c:90:3: warning: format '%d' expects argument of type 
'int', but argument 3 has type 'long unsigned int' [-Wformat=]
   sprintf(ebuf, "ERROR: Expected 5000 received %d", value_good);
   ^
XtSetSelectionTimeout.c:98:3: warning: format '%d' expects argument of type 
'int', but argument 3 has type 'long unsigned int' [-Wformat=]
   sprintf(ebuf, "ERROR: Expected 1 received %d", value_good);
   ^

Signed-off-by: Rhys Kidd 
---
 xts5/XtC/XtSetSelectionTimeout.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xts5/XtC/XtSetSelectionTimeout.m b/xts5/XtC/XtSetSelectionTimeout.m
index dbaf75c..4e97513 100644
--- a/xts5/XtC/XtSetSelectionTimeout.m
+++ b/xts5/XtC/XtSetSelectionTimeout.m
@@ -81,7 +81,7 @@ pid_t pid2;
XtRealizeWidget(topLevel);
tet_infoline("TEST: Verify the default");
if ((value_good = XtGetSelectionTimeout()) != (unsigned int)5000){
-   sprintf(ebuf, "ERROR: Expected 5000 received %d", value_good);
+   sprintf(ebuf, "ERROR: Expected 5000 received %lu", value_good);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
@@ -89,7 +89,7 @@ pid_t pid2;
XtSetSelectionTimeout((unsigned int )1);
tet_infoline("TEST: selectionTimeout is 1 milliseconds");
if ((value_good = XtGetSelectionTimeout()) != (unsigned int)1){
-   sprintf(ebuf, "ERROR: Expected 1 received %d", value_good);
+   sprintf(ebuf, "ERROR: Expected 1 received %lu", value_good);
tet_infoline(ebuf);
tet_result(TET_FAIL);
}
-- 
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] test: Fix stray Makefile reference to removed os test

2016-10-28 Thread Rhys Kidd

Fixes the following warning:

test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no program or
test/Makefile.am:69: library has 'os' as canonical name (possible typo)

Introduced upon the removal of test/os in:

commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
Author: Keith Packard 
Date:   Tue Dec 8 14:39:46 2015 -0800

Remove SIGIO support for input [v5]

This removes all of the SIGIO handling support used for input
throughout the X server, preparing the way for using threads for input
handling instead.

Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
to stub functions input_lock/input_unlock so that we don't lose this
information.

xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO.

v2: Don't change locking order (Peter Hutterer)
v3: Comment weird && FALSE in xf86Helper.c
Leave errno save/restore in xf86ReadInput
Squash with stub adding patch (Peter Hutterer)
v4: Leave UseSIGIO config parameter so that
existing config files don't break (Peter Hutterer)
v5: Split a couple of independent patch bits out
of kinput.c (Peter Hutterer)

Signed-off-by: Keith Packard 
Reviewed-by: Peter Hutterer 

Signed-off-by: Rhys Kidd 
---
 test/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index c89915c..b8a0f4d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -66,7 +66,6 @@ xfree86_LDADD=$(TEST_LDADD)
 touch_LDADD=$(TEST_LDADD)
 signal_logging_LDADD=$(TEST_LDADD)
 hashtabletest_LDADD=$(TEST_LDADD)
-os_LDADD=$(TEST_LDADD)
 
 libxservertest_la_LIBADD = $(XSERVER_LIBS)
 if XORG
-- 
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 xserver] Fix race condition in ConfigureWindow

2016-10-28 Thread Keith Packard

Erik Kurzinger  writes:

> Resubmitting with proper formatting, and a small change to the patch.

The protocol specifies that the ConfigureNotify event be
delivered before any Expose events, so we can't just move the event
generation until after the window has been configured and exposed.

It sounds like your driver might want to use the ConfigNotify hook in
the screen so that it can learn about configuration changes before the
client does?

-- 
-keith


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 xserver] Fix race condition in ConfigureWindow

2016-10-28 Thread Erik Kurzinger


Resubmitting with proper formatting, and a small change to the patch.

Signed-off-by: Erik Kurzinger 
---
 dix/window.c | 42 ++
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index ead4dc2..677fe65 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2380,26 +2380,6 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, 
ClientPtr client)
 }
 }

-if (SubStrSend(pWin, pParent)) {
-xEvent event = {
-.u.configureNotify.window = pWin->drawable.id,
-.u.configureNotify.aboveSibling = pSib ? pSib->drawable.id : None,
-.u.configureNotify.x = x,
-.u.configureNotify.y = y,
-.u.configureNotify.width = w,
-.u.configureNotify.height = h,
-.u.configureNotify.borderWidth = bw,
-.u.configureNotify.override = pWin->overrideRedirect
-};
-event.u.u.type = ConfigureNotify;
-#ifdef PANORAMIX
-if (!noPanoramiXExtension && (!pParent || !pParent->parent)) {
-event.u.configureNotify.x += screenInfo.screens[0]->x;
-event.u.configureNotify.y += screenInfo.screens[0]->y;
-}
-#endif
-DeliverEvents(pWin, , 1, NullWindow);
-}
 if (mask & CWBorderWidth) {
 if (action == RESTACK_WIN) {
 action = MOVE_WIN;
@@ -2425,6 +2405,28 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, 
ClientPtr client)

 if (action != RESTACK_WIN)
 CheckCursorConfinement(pWin);
+
+if (SubStrSend(pWin, pParent)) {
+xEvent event = {
+.u.configureNotify.window = pWin->drawable.id,
+.u.configureNotify.aboveSibling = pSib ? pSib->drawable.id : None,
+.u.configureNotify.x = x,
+.u.configureNotify.y = y,
+.u.configureNotify.width = w,
+.u.configureNotify.height = h,
+.u.configureNotify.borderWidth = bw,
+.u.configureNotify.override = pWin->overrideRedirect
+};
+event.u.u.type = ConfigureNotify;
+#ifdef PANORAMIX
+if (!noPanoramiXExtension && (!pParent || !pParent->parent)) {
+event.u.configureNotify.x += screenInfo.screens[0]->x;
+event.u.configureNotify.y += screenInfo.screens[0]->y;
+}
+#endif
+DeliverEvents(pWin, , 1, NullWindow);
+}
+
 return Success;
 #undef RESTACK_WIN
 #undef MOVE_WIN
--
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: [PATCH xbitmaps] Install pkgconfig file into arch-dependent location

2016-10-28 Thread Emil Velikov

On 23 September 2016 at 11:42, Heiko Becker  wrote:
> On 09/23/16 12:34, Emil Velikov wrote:
>> On 23 September 2016 at 08:07, Alan Coopersmith
>>  wrote:
>>> On 09/23/16 12:05 AM, Emil Velikov wrote:

 On 23 September 2016 at 07:31, Julien Cristau  wrote:
>
> On Thu, Sep 22, 2016 at 19:12:13 +0200, Heiko Becker wrote:
>
> That seems like it's going backwards, and your commit message doesn't
> explain why.
>
 That was my initial thought as well (going backwards). Then again,
 as-is the .pc file is located in a arch _in_ dependant location, which
 causes file conflicts as you have multilib - x86-86 & x86 installed
 for example. In such cases the files have different contents (path)
 which leads to link time issues.
>>>
>>>
>>> How can you have link time issues when there's noting in xbitmaps to
>>> link with?   It's purely xbm files, sometimes abused as C headers.
>>>
>> Ack, you're absolutely correct. I didn't realise that the xbitmaps
>> repo doesn't ship any libraries.
>
> It doesn't, but it provides includes and the includedir gets propagated
> via pkg-config, leading to a build error on a multi-arch layout when
> cross compiling xsetroot.
>
Yes, that's correct. From my [humble] experience - every 32bit build
"clashes" with the 64bit one for everything but the
libraries/executables.

Since everything else (man pages, images, headers) should be
identical, in theory at least, there isn't anything to be concerned
about. Thus some distros do not bundle the 'duplicates' with the 32bit
package.

If things are not the identical, one ought to attempt to resolve that first.

That's my take on it, but I could be very wrong on the topic.
Emil
___
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] dix: Use 'output_pending_clear' instead of open-coding it in CloseDownClient

2016-10-28 Thread Hans de Goede


Hi,

On 28-10-16 18:25, Keith Packard wrote:

Signed-off-by: Keith Packard 


Patch LGTM:

Reviewed-by: Hans de Goede 

Regards,

Hans



---
 dix/dispatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index e111377..f16a84e 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3406,7 +3406,7 @@ CloseDownClient(ClientPtr client)
 UngrabServer(client);
 }
 mark_client_not_ready(client);
-xorg_list_del(>output_pending);
+output_pending_clear(client);
 BITCLEAR(grabWaiters, client->index);
 DeleteClientFromAnySelections(client);
 ReleaseActiveGrabs(client);


___
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] dix: Bump MAXHASHSIZE for the resource db

2016-10-28 Thread Keith Packard

Keith Packard  writes:

> v2: Replace with a shorter code sequence which computes the same
> results for all but numBits == 7
>
> Reviewed-by: Adam Jackson 
> Signed-off-by: Keith Packard 

Merged.
   356db23..c85f818  master -> master

-- 
-keith


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 xserver] dix: Use 'output_pending_clear' instead of open-coding it in CloseDownClient

2016-10-28 Thread Keith Packard

Signed-off-by: Keith Packard 
---
 dix/dispatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index e111377..f16a84e 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3406,7 +3406,7 @@ CloseDownClient(ClientPtr client)
 UngrabServer(client);
 }
 mark_client_not_ready(client);
-xorg_list_del(>output_pending);
+output_pending_clear(client);
 BITCLEAR(grabWaiters, client->index);
 DeleteClientFromAnySelections(client);
 ReleaseActiveGrabs(client);
-- 
2.10.1

___
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] Small fix for 1.19

2016-10-28 Thread Keith Packard

Jon Turney  writes:

> Jon Turney (1):
>   glx/dri2: Don't build DRI loader if DRI2 isn't enabled

Merged.
   9ed5b26..356db23  master -> master

-- 
-keith


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 xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

2016-10-28 Thread Keith Packard

Hans de Goede  writes:

> Patch LGTM:
>
> Reviewed-by: Hans de Goede 

Thanks. Merged.
   2c91f32..9ed5b26  master -> master

-- 
-keith


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 xserver] ephyr: Leave window unmapped for -glamor-skip-present

2016-10-28 Thread Keith Packard

Eric Anholt  writes:

> Drop the extern ephyr_glamor_gles2 and it's:
>
> Reviewed-by: Eric Anholt 

Merged.
   cba5a10..2c91f32  master -> master

-- 
-keith


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 xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

2016-10-28 Thread Hans de Goede


Hi,

On 28-10-16 17:04, Keith Packard wrote:

If a work proc wakes up a sleeping client and it is ready to execute,
we need to re-compute the local 'are_ready' value before deciding
what timeout value to use in WaitForSomething.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98030
Signed-off-by: Keith Packard 


Patch LGTM:

Reviewed-by: Hans de Goede 

Regards,

Hans



---
 os/WaitFor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7d5aa32..ff1c85e 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -204,8 +204,10 @@ WaitForSomething(Bool are_ready)
crashed connections and the screen saver timeout */
 while (1) {
 /* deal with any blocked jobs */
-if (workQueue)
+if (workQueue) {
 ProcessWorkQueue();
+are_ready = clients_are_ready();
+}

 if (are_ready)
 timeout = 0;


___
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 v2] ramdac: Check sPriv != NULL in xf86CheckHWCursor()

2016-10-28 Thread Keith Packard

Alex Goins  writes:

> xf86CheckHWCursor() would dereference sPriv without NULL checking it. If 
> Option
> "SWCursor" is specified, sPriv == NULL. In this case we should assume that HW
> cursors are not supported.
>
> Signed-off-by: Alex Goins 
> Reviewed-by: Andy Ritger 

Merged.
   5cb3283..cba5a10  master -> master

-- 
-keith


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 xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

2016-10-28 Thread Keith Packard

If a work proc wakes up a sleeping client and it is ready to execute,
we need to re-compute the local 'are_ready' value before deciding
what timeout value to use in WaitForSomething.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98030
Signed-off-by: Keith Packard 
---
 os/WaitFor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7d5aa32..ff1c85e 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -204,8 +204,10 @@ WaitForSomething(Bool are_ready)
crashed connections and the screen saver timeout */
 while (1) {
 /* deal with any blocked jobs */
-if (workQueue)
+if (workQueue) {
 ProcessWorkQueue();
+are_ready = clients_are_ready();
+}
 
 if (are_ready)
 timeout = 0;
-- 
2.10.1

___
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 xts 1/3] xts5: Fix missing variable for format specifier

[PATCH xts 2/3] xts5: Fix missing variable for format specifier

[PATCH xts 3/3] xts5: Fix missing variable for format specifier

Re: [PATCH xserver] test: Fix stray Makefile reference to removed os test

[PATCH xts] xts5: Fix format specifier type warning in XtSetSelectionTimeout

[PATCH xserver] test: Fix stray Makefile reference to removed os test

Re: [PATCH xserver] Fix race condition in ConfigureWindow

Re: [PATCH xserver] Fix race condition in ConfigureWindow

Re: [PATCH xbitmaps] Install pkgconfig file into arch-dependent location

Re: [PATCH xserver] dix: Use 'output_pending_clear' instead of open-coding it in CloseDownClient

Re: [PATCH xserver] dix: Bump MAXHASHSIZE for the resource db

[PATCH xserver] dix: Use 'output_pending_clear' instead of open-coding it in CloseDownClient

Re: [PULL] Small fix for 1.19

Re: [PATCH xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

Re: [PATCH xserver] ephyr: Leave window unmapped for -glamor-skip-present

Re: [PATCH xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

Re: [PATCH v2] ramdac: Check sPriv != NULL in xf86CheckHWCursor()

[PATCH xserver] os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)

18 matches

Site Navigation

Mail list logo

Footer information