summaryrefslogtreecommitdiff
path: root/hw/xfree86
AgeCommit message (Collapse)AuthorFilesLines
2010-10-13Input: Add initial multitouch support from Xi 2.1Daniel Stone2-0/+40
Xi 2.1 adds TouchClasses to devices, as well as TouchBegin, TouchMotion and TouchEnd events, to allow support for multiple touchpoints on a single device. This is a full implementation of the Xi 2.1 additions. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-10-13Convert server to masked input valuatorsChase Douglas3-21/+83
XI2 allows for input event valuators to be masked. The current input module API only allows for ranges to be specified. This fixes all internal plumbing to use masks instead of ranges, and adds "M" mask versions of xf86Post*Event() functions. Note the minor version bump of the XInput ABI. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2010-10-05vbe: Fix copying the mode info blockAdam Jackson1-63/+3
Just use memcpy, seriously. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-05edid: Fix the HDTV sync pulse adjustmentAdam Jackson1-2/+2
Simple typo, should have been adjusting the horizontal timings consistently since we're not trying to mangle vertical at all. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Patrick E. Kane <pekane52@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-04xfree86: Do not call dlclose(NULL) [regression after ab7f057]Chris Wilson1-1/+2
During unwind following an error when attempting to a load a module, we attempt to call dlclose on a potentially NULL handle. This is a side-effect of removing the abstraction layer in ab7f057. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Adam Jackson <ajax@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-28Bump video driver ABI version to 9.0Aaron Plattner1-1/+1
Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-28Merge remote branch 'ajax/less-loader'Keith Packard19-522/+98
2010-09-28xfree86: Add 18bpp supportAdam Jackson1-0/+3
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-28xfree86: Kill pixmapPrivate with a vengeance (v2)Chris Wilson4-74/+0
ScrnInfo->pixmapPrivate only existed in order to catch invalid access to the framebuffer by making the backing data NULL across the VT switch. This was causing more confusion in the higher layers during mode setting without any real benefit, so remove it. v2: Kill ShadowModifyPixmapHeader() as well. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Julien Cristau <jcristau@debian.org> Cc: Andrew Guertin <lists@dolphinling.net> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-28modes: Beware the driver switching root pixmapsChris Wilson1-1/+2
Program received signal SIGSEGV, Segmentation fault. 0x080d4a2d in xf86RandR12ScreenSetSize (pScreen=0x8dca3a0, width=800, height=600, mmWidth=210, mmHeight=157) at ../../../../hw/xfree86/modes/xf86RandR12.c:731 731 ../../../../hw/xfree86/modes/xf86RandR12.c: No such file or directory. in ../../../../hw/xfree86/modes/xf86RandR12.c (gdb) bt full height=600, mmWidth=210, mmHeight=157) at ../../../../hw/xfree86/modes/xf86RandR12.c:731 randrp = 0x8dcae68 pScrn = 0x8dbeb28 config = <value optimized out> pRoot = 0x8e08e30 pScrnPix = 0xb6d12008 ret = 1 c = <value optimized out> mmWidth=210, mmHeight=157) at ../../randr/rrscreen.c:185 No locals. at ../../randr/rrscreen.c:307 pWin = 0x8e08e30 pScreen = 0x8dca3a0 i = <value optimized out> rc = 0 ../../randr/randr.c:485 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Julien Cristau <jcristau@debian.org> Tested-by: Julien Cristau <jcristau@debian.org> Cc: Keith Packard <keithp@keithp.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-28xserver: delete pervasively use of DISPATCH_PROCTiago Vignatti5-206/+108
Some functions had to be moved around due some missing static definitions. Another minor clean up like inexistent function declarations and etc were made also. Part of this patch was cooked using: sed -i -e '/static DISPATCH_PROC*.*;/d' `git ls-files` Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-23xfree86: nds32: add nds32 support for compiler related mmio codesMacpaul Lin1-0/+410
Add nds32 support for compiler related mmio codes. It includes byte-swap or non-swap operations. Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-23xfree86: nds32: add nds32 support for compiler specific codesMacpaul Lin1-3/+3
Add nds32 definitions and related assembly codes to compiler header files. Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-23xfree86: nds32: add nds32 definition for vgaHW support.Macpaul Lin1-1/+1
Add __nds32__ definitions for vgaHW support. Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-23xfree86: nds32: add nds32 definition for support linux video related io.Macpaul Lin1-2/+3
Add __nds32__ definitions for supporing correct io method for lnx_video.c Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-23Merge remote branch 'jamey/for-keith'Keith Packard4-62/+0
2010-09-22xfree86: Remove useless module setup functions where appropriateAdam Jackson10-96/+10
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22xfree86: Remove unused refcounting from input driversAdam Jackson2-6/+0
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: Remove a silly layer of reference countingAdam Jackson4-217/+51
libdl will refcount objects for us just fine, thanks. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: include cleanupAdam Jackson1-8/+0
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: Remove the handle field from LoaderOpenAdam Jackson3-19/+17
This was always 0 from all the callers. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: Remove unused canonical name fieldAdam Jackson3-8/+4
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: Remove unused module serial numberAdam Jackson2-4/+0
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-22loader: Merge dlloader directly into the loaderAdam Jackson5-220/+72
This lets us drop some double-tracking of loaded modules too. If your OS is too lame to have libdl, fix that first. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-18Xserver need not be compatible with old versions of xserver.Jamey Sharp4-62/+0
Delete time-traveling multiple personality disorder from the server. Gaetan notes: There were a couple of drivers containing an unknown version of the modes/parser code. This was done in server 1.2 time frame because it was released without mode code. It was barely or not maintained afterwards. There are currently no video drivers with a copy of the modes code. Most of these ifdefs were introduced in commit a8d760f567b19268329c4682495caa591f08a854, where Aaron wrote, This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2" since XORG_VERSION current went backwards at some point. Alan explains that: In Xorg 1.3, when we first released an Xorg server release decoupled from the katamari release schedule. (1.0 through 1.2 were released as part of X11R7.0 through 7.2, while 1.3 came out between X11R7.2 & 7.3.) Commit by Jamey Sharp and Josh Triplett. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Josh Triplett <josh@joshtriplett.org> Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
2010-09-14xfree86: delete useless "Primary device is not PCI" messageTiago Vignatti1-7/+2
The primary device being PCI or not has no effect on the server working. This message is superfluous. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: bus: assign PCI_SOURCES with the actual source filesTiago Vignatti1-2/+2
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: bus: move macros from common PCI header to private fileTiago Vignatti2-5/+5
Only int10/helper_exec.c is using them. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: dri: remove unused PCI macroTiago Vignatti1-2/+0
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: configure: move buses references to their own locationTiago Vignatti5-93/+93
This patch makes xf86Configure.c free of PCI and SBUS code, moving to a more meaningful location. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2010-09-14xfree86: bus: remove xfree86 and few other references from OS filesTiago Vignatti2-15/+0
Conceptually, os-support should have only a basic set of OS helpers which wouldn't mix with any DDX common structure (e.g. windowing structures, etc) This patch removes some xfree86-only and a few other unused references from os-support/bus. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: bus: remove useless automake variableTiago Vignatti1-2/+1
Leftover that was missed in f7abe05b. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-14xfree86: use xf86PciIsolateDevice to get PCI config informationTiago Vignatti4-17/+8
Make xf86IsolateDevice private on PCI common file. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-13Merge remote branch 'jamey/reviewed'Keith Packard8-501/+2
2010-09-13VGA arbiter: No need for arbitration around CreateGC.Jamey Sharp1-2/+0
None of XAA, EXA, or UXA do any hardware access during CreateGC, so they don't need VGA arbitration. I haven't found any open source drivers that hook CreateGC, so they're safe. I'd be surprised if any driver directly hooks CreateGC and does hardware access from it and needs VGA arbitration. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2010-09-13Delete redundant GC initializations.Jamey Sharp1-5/+0
When a GC is allocated, it is zeroed, including all storage requested with dixRegisterPrivateKey. So CreateGC hooks don't need to initialize anything to zero. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-09-13Delete xaaWrapper.Jamey Sharp4-490/+2
This was part of "An experimental pseudocolor emulation layer. Not fully completed, currently only works for 16bpp." Only neomagic tried to use it, and that was neutered by the removal of the fbpseudocolor portion of that emulation layer; the rest is easily removed. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-09-13Delete unused devPrivate field from GCFuncs and GCOps.Jamey Sharp4-4/+0
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2010-09-13xfree86: vgaarb: fix decoding stub APITiago Vignatti1-1/+1
This fix a problem introduced in commit 65466652. It closes also: https://bugs.freedesktop.org/show_bug.cgi?id=30160 Reported-by: <xunx.fang@intel.com> Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-10xfree86: fbdevhw: remove unnecessary debug codeTiago Vignatti1-35/+0
It very likely no one will want to print all functions of this file for debugging purposes. If this is the case, then a mix of ctags + cpp + gdb can do the same job. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-10xfree86: fbdevhw: remove unused cmap fields from main structureTiago Vignatti1-8/+0
It was never used since first git revision and probably no one cares for it. ABI break. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2010-09-10os/xfree86: remove macro checking for POSIX symbolsTiago Vignatti2-14/+0
We assume already that our X implementation is POSIX compliant anyway. So remove those redundant checking. SA_SIGINFO is left there. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-09-10Merge remote branch 'whot/for-keith'Keith Packard4-3/+15
2010-09-10Merge remote branch 'mattst88/master'Keith Packard8-46/+14
2010-09-10Merge remote branch 'vignatti/vgaarb-fixes'Keith Packard3-91/+101
2010-09-10Tag sdksyms.c entries with source file and line numberAaron Plattner1-1/+8
Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-09linux: Don't lose console events on non-evdev drivers (#29969)Thomas Hellstrom1-2/+3
The drain_console() function will race with new keyboard events being added by the hardware causing the server to lose keyboard events if the console fd is used for input. Only use the drain_console() when AllowEmptyInput is off which is the best indicator we have for whether the keyboard driver will be used. This patch will only fix the bug when hotplugging is disabled. What we really need is a way to figure out either whether we're _not_ using the keyboard driver (not predictable) or a way for the keyboard driver to disable drain_console(). X.Org Bug 29969 <http://bugs.freedesktop.org/show_bug.cgi?id=29969> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-09-06xfree86: Check for existence of button class before dereferencing it.Peter Hutterer1-1/+1
The Irxon Super Mini Bluetooth Wireless Keyboard for PC/PDA/Cell Phones keyboards have axes but not buttons. The evdev driver doesn't set up a button class for these keyboards and a motion event handled by DGAProcessPointerEvent dereferences the dev->button NULL pointer, causing a server crash. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-09-01xfree86: Document terminate not mapped by default (bug 25083)Jesse Adkins1-0/+10
Document that terminate is not mapped to Ctrl+Alt+Backspace by default, to help alleviate some confusion. Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-09-01xfree86: fix compiler warning about implicied decl of DuplicateModule.Peter Hutterer1-0/+1
../../../../hw/xfree86/common/xf86Xinput.c: In function ‘xf86AllocateInput’: ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: implicit declaration of function ‘DuplicateModule’ ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: nested extern declaration of ‘DuplicateModule’ ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: assignment makes pointer from integer without a cast Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>