- 26 Mar, 2013 1 commit
-
-
vdb@picaros.org authored
Section "Monitor" Identifier "a21inch" Option "PreferredMode" "1600x1200" Option "ZoomModes" "1600x1200 1280x1024 1280x1024 640x480" EndSection The option's effect is to search for and mark once each named mode in the output modes list. So the specification order is free and the zoom modes sequence follows the order of the output modes list. All marked modes are available via the Ctrl+Alt+Keypad-{Plus,Minus} key combination. See also http://bugs.freedesktop.org/show_bug.cgi?id=17954. This option has its use for combined monitor and television setups. It allows for easy switching between 60 Hz and 50 Hz modes even when a monitor refuses to display the input signal. (Includes a few minor changes suggested by Aaron for v2) Signed-off-by:
Servaas Vandenberghe <vdb@picaros.org> Reviewed-by:
Aaron Plattner <aplattner@nvidia.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
- 05 Mar, 2013 1 commit
-
-
Aaron Plattner authored
Otherwise, displays driven by GPU screens remain on all the time. Signed-off-by:
Aaron Plattner <aplattner@nvidia.com> Reviewed-by:
Alex Deucher <alexander.deucher@amd.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
- 01 Mar, 2013 3 commits
-
-
Dave Airlie authored
So in the cold plug server shutdown case, we reap the resources before we call CloseScreen handlers, so the config->randr_provider is a dangling pointer when the xf86CrtcCloseScreen handler is called, however in the hot screen unplug case, we can't rely on automatically reaped resources, so we need to clean up the provider in the xf86CrtcCloseScreen case. This patch provides a cleanup callback from the randr provider removal into the DDX so it can cleanup properly, this then gets called by the automatic code for cold plug, or if hot unplug it gets called explicitly. Fixes a number of random server crashes on shutdown Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58174 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=891140Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
Dave Airlie authored
The previous fix for the previous fix, didn't fully work, If we don't set compat_output we end up doing derferences of arrays with -1, leading to valgrind warnings. Reviewed-by:
Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
Dave Airlie authored
Due to another bug, the modesetting/udl driver would fail to init properly on hotplug, when it did the code didn't clean up properly, and on removing the device the server could crash. Found in F18 testing. Signed-off-by:
Dave Airlie <airlied@redhat.com> Reviewed-by:
Aaron Plattner <aplattner@nvidia.com>
-
- 15 Feb, 2013 2 commits
-
-
Peter Hutterer authored
xf86Cursor.c:19:18: warning: redundant redeclaration of 'inputInfo' [-Wredundant-decls] In file included from xf86Cursor.c:18:0: ../../../include/inputstr.h:614:57: note: previous declaration of 'inputInfo' was here Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Mark Kettenis <kettenis@openbsd.org>
-
Peter Hutterer authored
Unused as of 5d309af2Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Mark Kettenis <kettenis@openbsd.org>
-
- 12 Feb, 2013 1 commit
-
-
Aaron Plattner authored
This is necessary when the input handler deletes itself from the list. Bug found by Maarten Lankhorst, this patch uses the list macros instead of open-coding the fix. Signed-off-by:
Keith Packard <keithp@keithp.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 11 Feb, 2013 2 commits
-
-
Bryce Harrington authored
man xorg.conf states that the 'Device' identifier is required in the 'Screen' section, yet current xserver defaults properly and boots up fine without it. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20742Signed-off-by:
Bryce Harrington <bryce@canonical.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Bryce Harrington authored
Instead of defaulting to -intel for Oaktrail, Medfield, and CDV chips, default to -fbdev. For Poulsbo (only), attempt to use -psb if it's installed, and fallback to fbdev otherwise. All other Intel chips should use -intel. This fixed an issue where -intel would load on these chips and cause a boot failure. Newer -intel drivers avoid the boot hang, but it's still the wrong driver to load, so why take chances. The patch was originally created by Stefan Dirsch for OpenSUSE. We have included it in our stable release (Ubuntu "quantal" 12.10) since December. ref: https://bugzilla.novell.com/show_bug.cgi?id=772279 ref: https://bugs.launchpad.net/ubuntu/+bug/1069031 Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60514Signed-off-by:
Bryce Harrington <bryce@canonical.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
- 08 Feb, 2013 2 commits
-
-
Peter Hutterer authored
If we're about to abort, we're already in the signal handler and cannot call down to the default device cleanup routines (which reset, free, alloc, and do a bunch of other things). Add a new DEVICE_ABORT mode to signal a driver's DeviceProc that it must reset the hardware if needed but do nothing else. An actual HW reset is only required for some drivers dealing with the HW directly. This is largely backwards-compatible, hence the input ABI minor bump only. Drivers we care about either return BadValue on a mode that's not DEVICE_{INIT|ON|OFF|CLOSE} or print an error and return BadValue. Exception here is vmmouse, which currently ignores it and would not reset anything. This should be fixed if the reset is required. Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Keith Packard <keithp@keithp.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Ted Felix authored
If acpid sends a string in a format that we can't parse, bail out instead of potentially dereferencing a NULL-pointer. X.Org Bug 73227 <http://bugs.freedesktop.org/show_bug.cgi?id=73227> Signed-off-by:
Ted Felix <ted@tedfelix.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 06 Feb, 2013 5 commits
-
-
Alan Coopersmith authored
Call find_header first, returning on failure before calling malloc. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Alan Coopersmith authored
Found by parfait 1.1 memory analyser: Memory leak of pointer 'pAdapt' allocated with malloc((88 * num_adaptors)) at line 162 of hw/xfree86/common/xf86xvmc.c in function 'xf86XvMCScreenInit'. 'pAdapt' allocated at line 158 with malloc((88 * num_adaptors)). Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Alan Coopersmith authored
Also avoids leaving invalid pointers in structures if realloc had to move them elsewhere to make them larger. Found by parfait 1.1 code analyzer: Memory leak of pointer 'newCallbacks' allocated with realloc(((char*)offman->FreeBoxesUpdateCallback), (8 * (offman->NumCallbacks + 1))) at line 328 of hw/xfree86/common/xf86fbman.c in function 'localRegisterFreeBoxCallback'. 'newCallbacks' allocated at line 320 with realloc(((char*)offman->FreeBoxesUpdateCallback), (8 * (offman->NumCallbacks + 1))). newCallbacks leaks when newCallbacks != NULL at line 327. Memory leak of pointer 'newPrivates' allocated with realloc(((char*)offman->devPrivates), (8 * (offman->NumCallbacks + 1))) at line 328 of hw/xfree86/common/xf86fbman.c in function 'localRegisterFreeBoxCallback'. 'newPrivates' allocated at line 324 with realloc(((char*)offman->devPrivates), (8 * (offman->NumCallbacks + 1))). newPrivates leaks when newCallbacks == NULL at line 327. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Alan Coopersmith authored
Reported by parfait 1.1 code analyzer: Error: Null pointer dereference (CWE 476) Read from null pointer 'p' at line 746 of hw/xfree86/common/xf86Option.c in function 'xf86TokenToOptName'. Function 'xf86TokenToOptinfo' may return constant 'NULL' at line 721, called at line 745. Null pointer introduced at line 721 in function 'xf86TokenToOptinfo'. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Alan Coopersmith authored
Our in-house parfait 1.1 code analysis tool complained that every exit path from xf86ValidateModes() in hw/xfree86/common/xf86Mode.c leaks the storeClockRanges allocation made at line 1501 with XNFalloc. Investigating, it seems that this code to copy the clock range list to the clockRanges list in the screen pointer is just plain insane, and according to git, has been since we first imported it from XFree86. We start at line 1495 by walking the linked list from scrp->clockRanges until we find the end. But that was just a diversion, since we've found the end and immediately forgotten it, and thus at 1499 we know that storeClockRanges is NULL, but that's not a problem since we're going to immediately overwrite that value as the first thing in the loop. So we move on through this loop at 1499, which takes us through the linked list from the clockRanges variable, and for every entry in that list allocates a new structure and copies cp to it. If we've not filled in the screen's clockRanges pointer yet, we set it to the first storeClockRanges we copied from cp. Otherwise, as best I can tell, we just drop it into memory and let it leak away, as parfait warned. And then we hit the loop action, which if we haven't hit the end of the cp list, advances cp to the next item in the list, and then just for the fun of it, also sets storeClockRanges to the ->next pointer it has just copied from cp as well, even though it's going to overwrite it as the very first instruction in the loop body. v2: rewritten using nt_list_* macros from Xorg's list.h header Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 11 Jan, 2013 5 commits
-
-
Peter Hutterer authored
Introduced in 323869f3Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Dave Airlie <airlied@redhat.com>
-
Dave Airlie authored
The changes to miPointerSetPosition interface from int->double breaks the SIS driver build, so time to bump this. Signed-off-by:
Dave Airlie <airlied@redhat.com> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Peter Hutterer authored
DGA only handles master devices but it does intercept slave device events as well (since the event handlers are per event type, not per device). The DGA code must thus call into UpdateDeviceState to reset the button/key state on the slave device before it discards the remainder of the event. Test case: - Passive GrabModeSync on VCP - Press button - Enable DGA after ButtonPress - AllowEvents(SyncPointer) - Release button The button release is handled by DGAProcessPointerEvent but the device state is never updated, so the slave ends up with the button permanently down. And since the master's button state is the union of the slave states, the master has the button permanently down. X.Org Bug 59100 <http://bugs.freedesktop.org/show_bug.cgi?id=59100> Reported-by:
Steven Elliott <selliott4@austin.rr.com> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Dave Airlie <airlied@redhat.com>
-
Peter Hutterer authored
Reported-by:
Steven Elliott <selliott4@austin.rr.com> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Dave Airlie <airlied@redhat.com>
-
Peter Hutterer authored
Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 09 Jan, 2013 1 commit
-
-
Keith Packard authored
Instead of requiring every mode set to complete successfully, start up as long as at least one CRTC is working. This avoids failures when one or more CRTCs can't start due to mode setting conflicts. Signed-off-by:
Keith Packard <keithp@keithp.com> Reviewed-by:
Dave Airlie <airlied@redhat.com>
-
- 17 Dec, 2012 1 commit
-
-
Peter Hutterer authored
Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Aaron Plattner <aplattner@nvidia.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
- 12 Dec, 2012 2 commits
-
-
Dave Airlie authored
This reverts commit 76d9c62e. This breaks multi-GPU setups here, so lets drop it for now. Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
Dave Airlie authored
This commit regresses dri1 since it moves the drmSetServerInfo from being called at module load time to extension init time. However DRIScreenInit relies on this being called before it gets control. This patches moves the call into DRIScreenInit and seems to work here. Signed-off-by:
Dave Airlie <airlied@redhat.com>
-
- 06 Dec, 2012 1 commit
-
-
Yaakov Selkowitz authored
The formatter confused address operators preceded by casts with bitwise-and expressions, placing spaces on either side of both. That syntax isn't used by ordinary address operators, however, so fix them for consistency. Signed-off-by:
Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 28 Nov, 2012 2 commits
-
-
Chris Wilson authored
Following commit 37d956e3 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 10 11:14:20 2012 +1000 xf86: fix compat output selection for no output GPUs headless servers can no longer startup as we no longer select a compat output for the fake framebuffer. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56343Signed-off-by:
Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by:
Dave Airlie <airlied@redhat.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Thierry Reding authored
For non-PCI video devices, such as those found on many ARM embedded systems, the X server currently requires the BusID option to specify the full path to the DRM device's sysfs node in order to properly match it against the probed platform devices. In order to allow X to start up properly if either the BusID option was omitted or no configuration is present at all, the first video device is used by default. Signed-off-by:
Thierry Reding <thierry.reding@avionic-design.de> Reviewed-by:
Dave Airlie <airlied@redhat.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
- 21 Nov, 2012 1 commit
-
-
Daniel Stone authored
Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 19 Nov, 2012 1 commit
-
-
Adam Jackson authored
K_OFF is a slightly broken interface, since if some other process (cough, systemd) sets the console state to K_UNICODE then it undoes K_OFF, and now Alt-F2 will switch terminals instead of summoning the Gnome "run command" dialog. KDSKBMUTE separates the "don't enqueue events" logic from the keymap, so doesn't have this problem. Try it first, then continue falling back to older methods. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=859485Tested-by:
Josh Boyer <jwboyer@redhat.com> Signed-off-by:
Adam Jackson <ajax@redhat.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 05 Nov, 2012 2 commits
-
-
Yaakov Selkowitz authored
These functions are already declared in <X11/fonts/fontproto.h>. Redeclaring them just for _X_EXPORT causes tons of warnings throughout xserver, but they need to be declared somewhere to be picked up by sdksyms.sh. Doing so in a private header limits the warnings to sdksyms.c; fixing those as well would require changes to fontsproto. Signed-off-by:
Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
Yaakov Selkowitz authored
Signed-off-by:
Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 29 Oct, 2012 1 commit
-
-
Peter Hutterer authored
Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Keith Packard <keithp@keithp.com>
-
- 19 Oct, 2012 1 commit
-
-
Thierry Reding authored
Recent Linux kernels reworked the linux/input.h header file, which is now part of the "user-space API". The include guard therefore has an additional additional _UAPI prefix. Instead of adding another case to the #ifdef, drop any include guard checks and instead always undefine the BUS_* definitions on Linux. Signed-off-by:
Thierry Reding <thierry.reding@avionic-design.de> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 11 Oct, 2012 1 commit
-
-
Jon Turney authored
Fix compilation of Xorg DDX without XF86VIDMODE since 6e74fdda, by putting xf86vmode.c back under the XF86VIDMODE automake conditional it was accidentally taken out of. Signed-off-by:
Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by:
Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by:
Daniel Stone <daniel@fooishbar.org>
-
- 08 Oct, 2012 1 commit
-
-
Peter Hutterer authored
This call is required for external drivers (specifically NVIDIA) that do not share the xfree86 infrastructure to update the desktop dimensions. Without it, the driver would update the ScreenRecs but not update the total dimensions the input code relies on for transformation. This call is a thin wrapper around the already-existing internal call and should be backported to all stable series servers, with the minor ABI bump. Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> CC: Andy Ritger <aritger@nvidia.com> Reviewed-by:
Aaron Plattner <aplattner@nvidia.com>
-
- 04 Oct, 2012 2 commits
-
-
Stephan Schreiber authored
I noticed that the build-in int10 driver always reports "Unable to retrieve all of segment 0x0C0000." even though the entire BIOS data is retrieved with success. The associated code is in hw/xfree86/int10/generic.c, in the function xf86ExtendedInitInt10(): if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) { xf86DrvMsg(screen, X_WARNING, "Unable to retrieve all of segment 0x0C0000.\n"); } The function pci_device_read_rom() is from libpciaccess; its return value is not a size but an error status code: 0 means success. If pci_device_read_rom() returns 0 for success, the warning is generated. The proposed patch corrects the evaluation of the return value of pci_device_read_rom() and of the supplied BIOS size. Debian bug#686153 Signed-off-by:
Julien Cristau <jcristau@debian.org> Reviewed-by:
Dave Airlie <airlied@redhat.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Jason Gerecke authored
Commit 09e4b78f missed a case. Signed-off-by:
Jason Gerecke <killertofu@gmail.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
- 23 Sep, 2012 1 commit
-
-
Daniel Martin authored
Remove any reference to mibstore.h and miInitializeBackingStore() from the documentation. Reviewed-by:
Aaron Plattner <aplattner@nvidia.com> Reviewed-by:
Adam Jackson <ajax@redhat.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-