[PATCH] modesetting: handle NULL cursor in drmmode_set_cursor.

2017-06-22 Thread Dave Airlie
From: Dave Airlie We had a bug reported with a touchscreen where we could end up in here with a NULL cursor, so let's not crash the X server. Signed-off-by: Dave Airlie --- hw/xfree86/drivers/modesetting/drmmode_display.c | 3 +++ 1 file changed, 3

[PATCH xrandr v2 1/2] xrandr: allow a single value for --scale

2017-06-22 Thread Giuseppe Bilotta
This allows using e.g. --scale 0.5 as a shorthand for --scale 0.5x0.5 Signed-off-by: Giuseppe Bilotta --- man/xrandr.man | 7 --- xrandr.c | 8 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/man/xrandr.man b/man/xrandr.man index

[PATCH xrandr v2 0/2] xrandr: improve --scale option parsing

2017-06-22 Thread Giuseppe Bilotta
A couple of trivial patches. The first one allows the specification of a single scaling value (--scale 2 for --scale 2x2), the second makes parsing stricter by refusing the value if there is junk after an assumingly valid scaling factor (2x3a or 4j). v2: rebased on current head. Giuseppe Bilotta

[PATCH xrandr v2 2/2] xrandr: stricter --scale argument parsing

2017-06-22 Thread Giuseppe Bilotta
We used to accept something like --scale 2x3junk as a valid input (scaling x by 2 and y by 3), even though this isn't really a valid scaling factor. Fix by making sure there is nothing after the parsed number(s). Signed-off-by: Giuseppe Bilotta --- xrandr.c | 5

Re: [PATCH xserver] xfree86: Move DRICreatePCIBusID to xf86Pci.h

2017-06-22 Thread Adam Jackson
On Thu, 2017-06-22 at 12:51 +0100, Jon Turney wrote: > Thanks! That fixes things for me. > > Reviewed-by: Jon Turney Merged, sorry for the breakage: remote: I: patch #163003 updated using rev 5c8fb7d128e312e6c01cd40c7ada072c4b5f3776. remote: I: 1 patch(es)

Re: [PATCH xserver] xfree86: Move DRICreatePCIBusID to xf86Pci.h

2017-06-22 Thread Jon Turney
On 21/06/2017 20:58, Adam Jackson wrote: xf86str.h is parsed into sdksyms unconditionally but the symbol is only defined when building with PCI support. Move the decl to a header that sdksyms only parses when building PCI support. Signed-off-by: Adam Jackson ---