This doesn't apply to current git at all. The git index of ad38ba4 suggests
it's based on xf86-input-mouse 1.7.2, not the current 1.9.0 release or git
master.
-alan-
On 04/10/14 11:21 AM, Michael Thayer wrote:
Currently on Solaris absolute input reporting only takes resolution change
On 03/31/14 02:21 AM, Michael Thayer wrote:
In MousePickProtocol() with protocol PROT_AUTO we probe for the protocol to
use but drop the result in most cases. This was causing DEVICE_INIT and
DEVICE_ON to fail to be called with the VUID protocol. Git history suggests
that this code was original
Flagged by cppcheck 1.64:
[hw/dmx/config/xdmxconfig.c:306] -> [hw/dmx/config/xdmxconfig.c:323]:
(warning) Possible null pointer dereference: fs - otherwise
it is redundant to check it against null.
Signed-off-by: Alan Coopersmith
---
hw/dmx/config/xdmxconfig.c |3 ++-
1 file cha
On Tue, Apr 1, 2014 at 8:36 PM, wrote:
> From: Dominik Behr
>
> When setting crtc->gamma_size to randr_crtc->gammaSize we should
> use randr_crtc->gammaSize to allocate new gamma table in crtc.
> Currently, if randr_crtc->gammaSize > crtc->gammaSize the subsequent
> memcpy will overwrite memory
On Tue, Apr 1, 2014 at 8:02 PM, wrote:
> From: Dominik Behr
>
> Calculate gamma table using full [0,65536) range and do not make any
> assumptions about relation of gamma table size and significant bits.
>
> Gamma table size has nothing to do with number of significant bits in
> hardware.
> In p
I haven't understood enough of the implementation to see how to fix
this, but I can reliably crash Xephyr this way:
hw/kdrive/ephyr/Xephyr :1 -screen 1024x768 -glamor
DISPLAY=:1 x11perf -shmputxy10
Without the -glamor option to Xephyr, the x11perf command runs
successfully. I'm testing on current
On 04/18/14 06:29 PM, Robert Morell wrote:
The previous code was checking the wrong table for function pointers.
Signed-off-by: Robert Morell
For the series (1-3),
Reviewed-by: Alan Coopersmith
--
-Alan Coopersmith- alan.coopersm...@oracle.com
Oracle Solaris En
Both xRRSetProviderOutputSourceReq and xRRSetProviderOffloadSinkReq are
fixed-size requests, so the length on the wire should match exactly.
Signed-off-by: Robert Morell
---
randr/rrprovider.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/randr/rrprovider.c b/randr/rrpr
The protocol handlers all have support for swapping variable data and
replies, but the top-level dispatch plumbing was missing.
Signed-off-by: Robert Morell
---
randr/rrsdispatch.c | 138
1 file changed, 138 insertions(+)
diff --git a/randr/r
The previous code was checking the wrong table for function pointers.
Signed-off-by: Robert Morell
---
randr/randr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/randr/randr.c b/randr/randr.c
index 3c97714d8e1d..6e3f14b4e704 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@
Jamey Sharp writes:
> Fixes Piglit test "swapbuffersmsc-return swap_interval 0".
>
> Ensure that *swap_target gets initialized on any 'return Success' path,
> even if the swap request can't be completed by the driver and the server
> falls back to a simple blit. That path can also be triggered by
Jamey Sharp writes:
> swap_target is an out-parameter that needs to be set to the value that
> SBC will take on after this SwapBuffers request completes.
>
> However, it was also being used as a temporary variable to hold the MSC
> at which the SwapBuffers request got scheduled to occur. This con
Jamey Sharp writes:
> Reviewed-by: Jamey Sharp
I've merged the series:
3119aae..c701124 master -> master
--
keith.pack...@intel.com
pgpyCUQg_dO_F.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lis
Reviewed-by: Jamey Sharp
Jamey
On Fri, Apr 18, 2014 at 4:19 PM, Keith Packard wrote:
> Check return value from fgets and strchr instead of assuming they
> worked.
>
> [v2]
>
> Don't do any necessary work inside the assert call.
> Also make sure the return value was long enough.
>
> Signed-off-b
Jamey Sharp writes:
> For the series, with the exception of patch 1/8:
Thanks. Can you let me know if v2 of 1/8 is ok now?
--
keith.pack...@intel.com
pgpZmuyw1R2ko.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archive
Check return value from fgets and strchr instead of assuming they
worked.
[v2]
Don't do any necessary work inside the assert call.
Also make sure the return value was long enough.
Signed-off-by: Keith Packard
---
Responding to IRC review comments from Jamey
test/signal-logging.c | 11 +++
For the series, with the exception of patch 1/8:
Reviewed-by: Jamey Sharp
Patch 1 uses assert incorrectly, as we discussed on IRC.
Jamey
On Fri, Apr 18, 2014 at 3:21 PM, Keith Packard wrote:
> Here's a set of 8 tiny patches which eliminate warnings that are
> printed when the X server is compi
There's no sense verifying that we can create the lock file and then
ignoring the return value from write.
Signed-off-by: Keith Packard
---
os/utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/os/utils.c b/os/utils.c
index 6e6974e..83d85cd 100644
--- a/os/utils.c
+++
Here's a set of 8 tiny patches which eliminate warnings that are
printed when the X server is compiled with -D_FORTIFY_SOURCE=2.
[PATCH 1/8] test: Validate server log reading more carefully in
Actual bug fix in the test code.
[PATCH 2/8] kdrive: Explicitly ignore errors from the -switchCmd
[P
Check the return values from fread to make sure the elements are
actually getting read from the file.
Signed-off-by: Keith Packard
---
xkb/xkmread.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 258bb91..b6241b5 100644
--- a/xkb/xkm
When the server is started with the -displayfd option, check to make
sure that the writes succeed and give up running if they don't.
Signed-off-by: Keith Packard
---
os/connection.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/os/connection.c b/os/connection.c
index
I'm not sure what we'd do in this case anyways, other than fatal
error.
Signed-off-by: Keith Packard
---
hw/kdrive/linux/linux.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 6284de5..73a8169 100644
--- a/hw/kdr
Make it clear that we intentionally ignore the -switchCmd return
value. This keeps GCC from emitting a warning when the server is
compiled with -D_FORTIFY_SOURCE=2.
Signed-off-by: Keith Packard
---
hw/kdrive/src/kdrive.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a
Failing to clear this means that we'll attempt to write the display
number to a random file descriptor on subsequent X server generations.
Signed-off-by: Keith Packard
---
os/connection.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/os/connection.c b/os/connection.c
index e914d9d..5294e59
There's no place to log the message if writing to the log file fails,
and we surely don't want to crash in that case, so just ignore errors
and keep going.
Signed-off-by: Keith Packard
---
os/log.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/os/log.c b/os/log.c
Check return value from fgets and strchr instead of assuming they
worked.
Signed-off-by: Keith Packard
---
test/signal-logging.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/signal-logging.c b/test/signal-logging.c
index 88b37c1..1bb0bd5 100644
--- a/test/sig
GetGlyphs is supposed to always return the full list of characters
when there is a default character available. However, if an
application opens a 16-bit two dimensional font and then draws with
8-bit requests, GetGlyphs will return zero glyphs if there is no 0th
row. This is probably a bug in GetG
This adds a large comment to include/scrnintstr.h which should serve
to document the correct way to wrap any screen procedure, with a
particular focus on how to dynamically add/remove wrapping layers
while the server is running.
Signed-off-by: Keith Packard
---
include/scrnintstr.h | 90
miSpriteBlockHandler was leaving the BlockHandler wrapped until just
before calling any nested block handler. If any code executed before
that added or removed block handlers, the wrapping chain would have
been broken.
Signed-off-by: Keith Packard
---
mi/misprite.c | 4 ++--
1 file changed, 2 in
Here's the patches I proposed which split the fixing of the block
handler wrapping into five individual fixes.
[PATCH 1/5] Document how to correctly wrap screen procedures
Adds the giant comment to scrnintstr.h
[PATCH 2/5] hw/xfree86: Fix block handler wrapping in xf86Rotate
Fixes the demonst
Change the screen proc epilog code to re-fetch the current screen
function in case a nested proc changes how things work. This isn't a
problem with the current code as all of the wrapping layers that are
set up at server init time (like the VGA arbiter) leave themselves in
the screen proc chain for
xf86Rotate, it was delaying unwrapping the BlockHandler until after
calling xf86RotateRedisplay. If there was a software cursor on the
screen, the redisplay operation would cause cursor to be removed from
the frame buffer and the misprite block handler to be inserted into
the block handler chain wi
When no shadow frame buffer is needed, the rotate block handler
doesn't need to be called any more. Remove it from the chain.
Signed-off-by: Keith Packard
---
hw/xfree86/modes/xf86Rotate.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/modes/xf86Rotate.
Alan Coopersmith writes:
> They work, as long as you only ever pass a literal string to them, not a
> pointer.
Right, but there's no type safety in that.
> Seems like a reasonable simplification in the server - hard to use from other
> modules (libXfont, drivers, etc.) until you're sure you'll
Hi Hans!
Now that you've just submitted your last pull-req, could you please review
again this patch series?
http://lists.x.org/archives/xorg-devel/2014-April/041690.html
Thanks in advance!
Em 18/04/2014 14:41, "Keith Packard" escreveu:
>
> Hans de Goede writes:
>
> > Guillem Jover (4):
> >
On 04/18/14 11:43 AM, Keith Packard wrote:
Alan Coopersmith writes:
glamor/glamor_xv.c:#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
hw/kdrive/src/kinput.c:#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
xkb/ddxBeep.c:#define MAKE_ATOM(a)MakeAtom(a,sizeof(a)-1,TRUE)
xkb/xkbDflt
These two patches together clean up commit b180e439, which has been in
xserver releases since 1.9. That commit was attempting to fix an
OML_sync_control spec compliance bug; these finish the job.
I'd like to suggest that, once these patches are merged to master, they
also be included in any future
Fixes Piglit test "swapbuffersmsc-return swap_interval 0".
Ensure that *swap_target gets initialized on any 'return Success' path,
even if the swap request can't be completed by the driver and the server
falls back to a simple blit. That path can also be triggered by setting
swap_interval to 0, wh
swap_target is an out-parameter that needs to be set to the value that
SBC will take on after this SwapBuffers request completes.
However, it was also being used as a temporary variable to hold the MSC
at which the SwapBuffers request got scheduled to occur. This confusion
makes it harder to reaso
Gaetan Nadon writes:
> Automake 1.14 gives us warning about source code specified in _SOURCES
> that comes from directories other than the current one. It suggests to enable
> the subdir-objects feature which only supports code in sub directories.
>
> The test directory needs source from hw/xfree
Alan Coopersmith writes:
> glamor/glamor_xv.c:#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
> hw/kdrive/src/kinput.c:#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
> xkb/ddxBeep.c:#define MAKE_ATOM(a)MakeAtom(a,sizeof(a)-1,TRUE)
> xkb/xkbDflts.h:#define GET_ATOM(d,s)MakeAtom(
Rob Clark writes:
> Hi Keith,
>
> This pull request doubly fixes build breakage on arm:
>
> * my two patches make arm default to stub int10 implementation (and
> fix stub implementation to actually compile).. this is what 99.9% of
> folks on ARM want
> * Thierry's patch actually fixes the real in
Signed-off-by: Eric Anholt
---
glamor/glamor_egl.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 1755d23..54af275 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -97,8 +97,15 @@ glamor_egl_get_screen_private(ScrnInfoPtr sc
This matches the Xephyr behavior. Now that we know when to reset the
context in the presence of GLX, we don't need to try to keep our stuff
from being smashed by GLX.
Signed-off-by: Eric Anholt
---
glamor/glamor_egl.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/glam
Fixes a usage of the wrong context with swrast GLX's GetImage entrypoint.
---
glamor/glamor_pixmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 371e486..54b414b 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pi
I needed to add some code to each one, so it's a good time to make a
helper func.
Signed-off-by: Eric Anholt
---
glx/glxdri2.c | 48 +---
1 file changed, 21 insertions(+), 27 deletions(-)
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 5d1a45b..94476
Signed-off-by: Eric Anholt
---
glamor/glamor_egl.c | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index d37de9b..9b6b323 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -166,10 +166,14 @@ glamor_get_fl
This gets us some more context changes that are needed to make sure
the two sides render to the right drawables and manipulate the right
objects.
Signed-off-by: Eric Anholt
---
glamor/glamor_egl.c | 14 ++
glamor/glamor_glx.c | 6 --
glamor/glamor_utils.h | 5 -
3 files
We want to make sure that lastGLContext is set correctly during
makeCurrent, because we may have recursive GL context changes in the
DRI2 interfaces due to glamor.
Signed-off-by: Eric Anholt
---
glx/glxcmds.c | 6 ++
glx/glxext.c | 3 ++-
2 files changed, 4 insertions(+), 5 deletions(-)
di
Here it is, at long last. I was stumped for several days with a weird
fbo incomplete that was happening after my first round of fixes, and
it took a day's detour of cooking up a Xephyr with DRI3 to get a fast
debug environment and figure out what was going on (xephyr-glamor-egl
is that branch. I
Signed-off-by: Eric Anholt
---
glamor/glamor_glx.c | 8
1 file changed, 8 insertions(+)
diff --git a/glamor/glamor_glx.c b/glamor/glamor_glx.c
index db8e661..7107c7c 100644
--- a/glamor/glamor_glx.c
+++ b/glamor/glamor_glx.c
@@ -36,6 +36,14 @@
static void
glamor_glx_make_current(struc
This hook calls unbindContext in the DRI driver interface, which
unsets the dispatch table, regardless of whether the context argument
was the current one or not.
Signed-off-by: Eric Anholt
---
glx/glxext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/glx/glxext.c b/gl
These functions are called from the GL driver, in some series of GL
calls by GLX. If some server component (like glamor CreatePixmap for
GetBuffers()) changes the GL context on us, we need to set it back or
the later GL calls will land in the glamor context instead of the GLX
context.
Signed-off-
Now that we have the DIX global state for the current context, we
don't need to track nesting to try to reduce MakeCurrent overhead.
Signed-off-by: Eric Anholt
---
glamor/glamor.c | 6 ++
glamor/glamor_context.h | 9 +
glamor/glamor_copyarea.c | 13 -
glamo
GLX is trying to track whether the context it wants is current, to
avoid the glFlush() (and the rest of the overhead) that occurs on all
MakeCurrent calls. However, its cache can be incorrect now that
glamor exists. This is a step toward getting glamor to coordinate
with GLX.
Signed-off-by: Eric
Michael Thayer writes:
> On 14/04/14 21:35, Keith Packard wrote:
>> Julien Cristau writes:
>>
>>> Only since
>>> http://cgit.freedesktop.org/xorg/xserver/commit/?id=901fbfbbbd71c0d82080957f8ba09eebbc786f2b
>>>
>>> Which could probably have used a different name to avoid silent
>>> breakage.
>>
>
Adam Jackson writes:
> This was added for DRM_IOCTL_SET_VERSION support, which has been around
> for over ten years now. Since we require ≥2.3.0 in configure.ac this
> would really only protect you if you managed to build against a modern
> libdrm but run against one that's more than 7½ years old
Hans de Goede writes:
> Guillem Jover (4):
> Xorg: Add Xorg.wrap to hw/xfree86/.gitignore
> Xorg.wrap: Use instead of hardcoding libdrm include path
> Xorg.wrap: Clarify error messages
Note that this patch does two things (clarify error messages and add
missing "/"). Please ma
Bad anholt, no biscuit. Broken in commit
4c9a20072552c52b3763bd73e7a7e9b9cb8b4993.
Signed-off-by: Jamey Sharp
Cc: Eric Anholt
---
glamor/glamor_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 7b1615d..5b341d3 100644
--
Hi Keith,
Please pull from my tree for a bunch of misc. xserver fixes.
The following changes since commit c917fa411502d402b9c69de30f6a88e102bb8610:
glamor: Always allocate precisely the requested pixmap size (2014-04-17
15:01:26 -0700)
are available in the git repository at:
git://people.
On 14-04-18 05:31 AM, Hans de Goede wrote:
> Cc: Gaetan Nadon
> Signed-off-by: Hans de Goede
> ---
> hw/xfree86/man/Xorg.wrap.man | 4 ++--
> hw/xfree86/man/Xwrapper.config.man | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/xfree86/man/Xorg.wrap.man b/hw/xfr
On 14-04-18 05:31 AM, Hans de Goede wrote:
> Fix suggested by: Gaetan Nadon
>
> Cc: Gaetan Nadon
> Signed-off-by: Hans de Goede
> ---
> hw/xfree86/man/Makefile.am | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/hw/xfree86/man/Makefile.am b/hw/xfree86/man/Makefile.am
> index f41d26c..
Reviewed-by: Colin Harrison
And works for me cross-compiling with MinGW-w64 for Microsoft Windows (a
magic patch solving an old/large problem!)
Thanks,
Colin Harrison
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/
Reviewed-by: Colin Harrison
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
On 01/04/2014 14:32, Jon TURNEY wrote:
> On 18/12/2013 14:52, Jon TURNEY wrote:
>> On 17/12/2013 01:35, Ian Romanick wrote:
>>> On 12/08/2013 08:57 AM, Jon TURNEY wrote:
At the moment we have a mix of ARB and non-ARB suffixed forms for
ARB_multitexture functions
e.g. glMultiTexCoord
With the previous patches applied, we now have crash due to use-after-free when
a client exits without deleting all it's GL contexts
On client exit, CloseDownClient first calls glxClientCallback() with
ClientStateGone, which calls __glXFreeContext() directly.
Subsequently CloseDownClient() frees
Some sequences of glean tests fail with GLXBadCurrentWindow when using indirect
rendering, e.g. glean -t 'fpexceptions getString'.
Flush a context which is being made non-current due to the drawable on which is
it is current going away. Waiting until another context is made current is too
late, a
This reverts commit 7f5adf73a0f9a951a6df201532b4031d38054369.
This seems to miss the whole point of the idExists flag, as it makes the
lifetime of that being true the same as the lifetime of the Context resource.
The previously current context tag is always given in a MakeContextCurrent
request,
Fixes for a few problems with GLX and indirect contexts.
I can reproduce [1/3] and [2/3] on X server 1.15.1, mesa 10.1.0 (from Ubuntu
14.04), but not on X server 1.14.5 mesa 9.2.1 (from Ubuntu 13.10), so these are
probably regressions in 1.15 and may be candidates for that branch.
Jon TURNEY (3
Hi,
Looks good, thanks:
Reviewed-by: Hans de Goede
I'll include these in my next pull-req to Keith.
Regards,
Hans
On 04/14/2014 06:13 PM, Guillem Jover wrote:
> Hi!
>
> I've adapted the porting patches I submitted to the Debian Xorg wrapper
> long ago to the native one, and in the process
Hi,
On 04/09/2014 03:47 AM, Peter Hutterer wrote:
> last_mt_vals_slot is only used in one location and there we can just use
> cur_slot
>
> Signed-off-by: Peter Hutterer
Series looks good, series is:
Reviewed-by: Hans de Goede
One remark about patches 5/6 and 6/6, in the mean time we've gott
Hi,
On 04/10/2014 05:34 PM, Adam Jackson wrote:
> Just throw BadPicture instead of crashing. It's not currently a
> meaningful thing to do anyway, RenderSetPictureRectangles would error if
> you tried (which this patch changes to BadPicture as well for
> consistency). The problem with trying to
Cc: Gaetan Nadon
Signed-off-by: Hans de Goede
---
hw/xfree86/man/Xorg.wrap.man | 4 ++--
hw/xfree86/man/Xwrapper.config.man | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/man/Xorg.wrap.man b/hw/xfree86/man/Xorg.wrap.man
index f2153e3..58937c7 100644
--- a
Fix suggested by: Gaetan Nadon
Cc: Gaetan Nadon
Signed-off-by: Hans de Goede
---
hw/xfree86/man/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/xfree86/man/Makefile.am b/hw/xfree86/man/Makefile.am
index f41d26c..5da404c 100644
--- a/hw/xfree86/man/Makefile.am
+++ b/hw/xfre
74 matches
Mail list logo