summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-05-09EXA: Honour op parameter to exaGlyphs even if maskFormat == NULLMichel Dänzer1-4/+4
Reported-by: Uli Schlachter <psychon@znc.in> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94775 Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Uli Schlachter <psychon@znc.in>
2016-05-06modesetting: fix build with glamor disabled.Dave Airlie1-0/+4
Fix build without --enable-glamor. Caught by the arm tinderbox. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-05-04xfree86: drop unneeded strdup for modulepath/logfileEmil Velikov1-12/+2
The destination variable is never freed, thus we even plug some memory leaks. v2: Rebase against updated xf86CheckPrivs() helper. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-05-04xfree86: use the xf86CheckPrivs() helper for modulepath/logfileEmil Velikov1-27/+23
v2: Rebase against updated xf86CheckPrivs() helper. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-05-04xfree86: factor out the check priviliges and print a big warningEmil Velikov1-14/+12
Current message was quite off "file specified must be a relative path" and alike. Just factor it out and use "path/file" as needed. v2: Rework error message, drop "Using default", print actual arg value. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-05-04modesetting: set capabilities up after glamor and enable offload caps.Dave Airlie1-12/+16
This moves the capabilites setting to after glamor is initialised, and enables the offload caps in cases where they work. This enables DRI2 PRIME support with modesetting. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2016-05-04xf86Crtc: don't set the root window property on slave GPUs.Dave Airlie1-1/+2
Slave GPUs don't have a root window to set this on, so don't. This fixes some crashes I saw just playing around. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2016-05-04modesetting: set driverPrivate to NULL after closing fd.Dave Airlie1-1/+1
Otherwise ms_ent_priv will return NULL and things will fall apart. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2016-05-04randr/provider: only allow slave gpu to be offload sources.Dave Airlie1-0/+2
The other way around makes no sense. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2016-05-04modesetting: Consistent whitespace in driver.cAlex Goins1-18/+18
For some reason a couple of the dirty functions in driver.c used 8 spaces per tab instead of 4 like the rest of the file. Fix this to make it more consistent and give me more room to work in ms_dirty_update in subsequent commits. v1: N/A v2: N/A v3: N/A v4: Initial commit Signed-off-by: Alex Goins <agoins@nvidia.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-05-04dix: Push UpdateCurrentTimeIf down out of the main loopAdam Jackson12-17/+39
This was added in: commit 312910b4e34215aaa50fc0c6092684d5878dc32f Author: Chase Douglas <chase.douglas@canonical.com> Date: Wed Apr 18 11:15:40 2012 -0700 Update currentTime in dispatch loop Unfortunately this is equivalent to calling GetTimeInMillis() once per request. In the absolute best case (as on Linux) you're only hitting the vDSO; on other platforms that's a syscall. Either way it puts a pretty hard ceiling on request throughput. Instead, push the call down to the requests that need it; basically, grab processing and event generation. Cc: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-05-04xkb: after changing the keymap, force an indicator updatePeter Hutterer3-2/+7
When NumLock is on and a new keymap is applied, the next modifier state change will turn off that LED (but leave the state enabled). The cause for this is a bit convoluted: * the SLI explicitState is copied from the current state in ProcXkbGetKbdByName. Thus, if NumLock is on, that state is 0x2. * on the next modifier key press (e.g. Shift), XkbApplyState() calls into XkbUpdateIndicators() -> XkbUpdateLedAutoState() to update SLIs (if any) for the currently changed modifier. But it does so with a mask only for the changed modifier (i.e. for Shift). * XkbUpdateLedAutoState() calculates the state based on this mask and ends up with 0 because we don't have a Shift LED and we masked out the others. * XkbUpdateLedAutoState() compares that state with the previous state (which is still 0x2) and then proceeds to turn the LED off This doesn't happen in the normal case because either the mask encompasses all modifiers or the state matches of the masked-out modifiers matches the old state. Avoid this issue by forcing an SLI update after changing the keymap. This updates the sli->effectiveState and thus restores everything to happy working order. https://bugzilla.redhat.com/show_bug.cgi?id=1047151 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
2016-05-04XQuartz: Update copyright yearsJeremy Huddleston Sequoia1-2/+2
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-04XQuartz: Add --with-bundle-version and --with-bundle-version-string ↵Jeremy Huddleston Sequoia3-3/+15
configure options Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-03XQuartz: Add --with-sparkle-feed-url configure optionJeremy Huddleston Sequoia3-2/+6
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-03XQuartz: Update release feed URL to use new https URLJeremy Huddleston Sequoia1-14/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-03XQuartz: Fix the help text for --with-bundle-id-prefixJeremy Huddleston Sequoia1-1/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-03XQuartz: Remove --with-launchd-id-prefixJeremy Huddleston Sequoia1-3/+0
It's been deprecated for years. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-03xfree86: add support for MatchIsTabletPadPeter Hutterer8-0/+26
The tablet pads have been separate kernel devices for a while now and libwacom has labelled them with the udev ID_INPUT_TABLET_PAD for over a year now. Add a new MatchIsTabletPad directive to apply configuration options specifically to the Pad part of a tablet. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-05-02modesetting: port clean start code from amdgpu. (v2)Dave Airlie3-12/+36
Both radeon and amdgpu don't set the mode until the first blockhandler, this means everything should be rendered on the screen correctly by then. This ports this code, it also removes the tail call of EnterVT from ScreenInit, it really isn't necessary and causes us to set a dirty mode with -modesetting always anyways. v2: reorder set desired modes vs block handler as done for amdgpu. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-05-02modesetting: add support for background none.Dave Airlie4-26/+106
This adds support using glamor for background None. loosely based off the amdgpu code. relies on the glamor_finish code. Acked-by: Eric Anholt <eric@anholt.net> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2016-04-29kdrive: Nuke a bunch of dead codeAdam Jackson1-441/+0
gcc6 says: keyboard.c:46:21: warning: ‘linux_to_x’ defined but not used Only referenced by a bunch of long if-0'd code, so chuck it all out. Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-29dix: Squash some new gcc6 warningsAdam Jackson5-7/+6
-Wlogical-op now tells us: devices.c:1685:23: warning: logical ‘and’ of equal expressions Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-29x86emu: Change include order to avoid conflict with system headerAndreas Schwab2-9/+1
R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate definitions. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Andreas Schwab <schwab@suse.de>
2016-04-29glamor: add glamor_finish APIDave Airlie2-0/+10
Some drivers are calling glFinish, they really should be doing this. This also is needed for some reverse prime scenarios. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2016-04-25xwayland-shm: fortify fallocate against EINTRMarek Chalupa1-2/+8
If posix_fallocate or ftruncate is interrupted by signal while working, we return -1 as fd and the allocation process returns BadAlloc error. That causes xwayland clients to abort with 'BadAlloc (insufficient resources for operation)' even when there's a lot of resources available. Fix it by trying again when we get EINTR. Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-04-25configure.ac: Keep environment CFLAGS when testingAlexandre Courbot1-2/+2
DRI2 detection could fail if configure is invoked with a sysroot passed as CFLAGS. Ideally configure should invoke gcc with the sysroot argument passed to the configure script, but for some reason this is not done by AC_COMPILE_IFELSE. Fix this by ensuring CFLAGS are preserved when checking for stuff. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2016-04-22dix/ptraccel: Remove float literalsSimon Thum1-19/+19
This was fine back when valuators were integer. Device properties are float (not double), so some instances remain. Signed-off-by: Simon Thum <simon.thum@gmx.de> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-22dix/ptraccel: Fix memory leak in InitPredictableAccelerationSchemeSimon Thum1-2/+8
This was quite unlikely except in situations where a proper startup would have been impossible anyway, but since automated checks don't grade likelyhood just fix it. Detected by Jeremy Huddleston's clang checks. Signed-off-by: Simon Thum <simon.thum@gmx.de> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-19Xi: don't deliver emulated motion events for non-emulating touchesPeter Hutterer1-0/+3
The touchpoint knows whether it should be emulating or not and we have a check for that later. Check for this before we generate the event and try to deliver it, lest we trigger a bug warning. https://bugzilla.redhat.com/show_bug.cgi?id=1282252 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-18xfree86/parser: simplify #ifdef ladderEmil Velikov1-22/+9
Rather than 'hacking' around symbol names and providing macros such as 'Local' just fold things and make the code more readable. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-04-18xfree86/parser: reuse StringToToken() in xf86getToken()Emil Velikov1-8/+2
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-04-18xfree86/parser: move StringToToken() definition further upEmil Velikov1-14/+12
... so that we can use it without the forward declaration. Plus we're doing to reuse it in the next commit ;-) Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-04-18xfree86/parser: annotate xf86ConfigSymTabRec as constant dataEmil Velikov18-37/+33
Add the const notation to all the static storage as well as the functions that use it - xf86getToken(), xf86getSubTokenWithTab(), StringToToken() and xf86getStringToken(). Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2016-04-18dri3: remove unused file dri3int.hEmil Velikov1-26/+0
Copied during the prototyping stage and never used. Cc: Keith Packard <keithp@keithp.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-04-18xfree86: Remove xf86RegisterRootWindowPropertyAdam Jackson6-146/+1
All consumers have been ported to the root window callback, so this can all be nuked. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Create EDID atom from the root window callback (v2)Adam Jackson1-22/+9
v2: Fix swapped callback args Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Remove a never-hit diagnostic messageAdam Jackson1-11/+4
Practically speaking, the EDID major version is never not 1. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Make xf86SetDDCproperties work more than once (v2)Adam Jackson1-6/+29
We can call this more than once via xf86OutputSetEDID since hotplug is actually a thing in RANDR 1.2, but xf86RegisterRootWindowProperty merely adds the data to a list to be applied to the root at CreateWindow time, so calls past the first (for a given screen) would have no effect until server regen. Once we've initialised pScrn->pScreen is filled in, so we can just set the property directly. v2: Removed pointless version check, deobfuscate math (Walter Harms) Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Remove some leftovers from DisplayID supportAdam Jackson2-9/+2
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Unexport xf86Initialising, remove xf86ServerIsInitialisingAdam Jackson4-21/+1
Neither of these are used from outside the server. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Create VT atoms from the root window callback (v2)Adam Jackson1-42/+25
v2: Fix swapped callback args Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18xfree86: Create seat atom from the root window callback (v2)Adam Jackson1-20/+19
v2: Fix swapped callback args Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-18dix: Add RootWindowFinalizeCallbackAdam Jackson2-0/+5
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-04-15glamor: fix wrong offset on composite rectanglesOlivier Fourdan1-9/+9
When using PictOpSrc, the destination is wrongly shifted back to (0, 0). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94568 Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2016-04-15xwayland: Fix compiler warning in GLAMOR XvOlivier Fourdan1-1/+1
XvWindowMask is defined as 0x00020000 and cannot fit in the XvAdaptor type which is defined as an unsigned char, thus causing a compiler warning: xwayland-glamor-xv.c: In function ‘xwl_glamor_xv_add_adaptors’: xwayland-glamor-xv.c:339:16: warning: large integer implicitly truncated to unsigned type [-Woverflow] This XvWindowMask value is actually not used for XvAdaptor itself but by the server in its xf86xv implementation, so we don't even need that mask in our xwayland-glamor-xv implementation. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2016-04-15xkb: fix SlowKeys release/reject beepsPeter Hutterer1-1/+4
Wrong use of the mask here caused a beep whenever a key was rejected but also when it was released after being accepted. Fix the mask to check for the correct enabled controls. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
2016-04-07hw/xwin: xcbify internal window managerJon Turney4-564/+589
Convert the code for the multiwindow mode internal window manager to xcb xcb conversion avoids xlib/xserver namespace collision and _XSERVER64 type sizing issues v2: Various fixes v3: Don't include X11/extensions/windowswmstr.h, which uses the Display type and thus depends on Xlib.h, just for _WINDOWSWM_NATIVE_HWND v4: Fix indentation, add some error handling. Fix a bug with ConfigureNotify handling v5: Fix a bug which prevented WM_NORMAL_HINTS from being checked Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2016-04-07hw/xwin: In multiwindow mode, do window minimization entirely in the WMJon Turney3-43/+20
Remove winMinimizeWindow(), implement as UpdateState() in the WM instead, which uses getHwnd() to map a Window XID to a HWND (like everything else in the WM), rather than peering into the servers internal data structures. Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2016-04-07hw/xwin: xcbify code for converting X11 icon to Win32 iconJon Turney7-66/+99
Convert the code for converting an X11 icon to Win32 icon from Xlib to xcb. v2: some warning fixes in winXIconToHICON() v3: declaration-after-statement warning fixes v4: printf format fixes v5: convert in place rather than in a library This also avoids the xlib/xserver namespace collision issues, so winmultiwindowicons.h can be included everywhere it should be, which fixes compilation with -Werror=implicit-function-declaration Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>