summaryrefslogtreecommitdiff
path: root/hw/xfree86
AgeCommit message (Collapse)AuthorFilesLines
2011-02-24xfree86: Bump video ABI to 10.0Keith Packard1-1/+1
RandR 1.4 revert changed things Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24Merge remote branch 'kibi/master'Keith Packard1-1/+1
2011-02-24Removing unused codeAlexandr Shadchin2-13/+1
In OpenBSD removed support PCCONS in 2002 year http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2 Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24Merge remote branch 'ajax/for-keithp'Keith Packard1-1/+9
2011-02-23Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct"Keith Packard3-115/+65
This reverts commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc.
2011-02-23Revert "randr: Add sprite position transforms"Keith Packard5-97/+12
This reverts commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8.
2011-02-23Revert "randr: Implement RRSetCrtcConfigs"Keith Packard1-1/+0
This reverts commit d94a035ea9eb3167fc4f35b2d9f0d53f8807014c.
2011-02-23Revert "hw/xfree86/modes: Add optional driver API for RRSetCrtcConfigs"Keith Packard2-163/+28
This reverts commit 86c489c319c705f710bee3897fe27600ce15008e.
2011-02-23Revert "randr: Add per-crtc pixmaps"Keith Packard3-109/+4
This reverts commit 82612045e11f2b882ae132e184a9629f43f1c424.
2011-02-23Revert "DIX is responsible for ref counting scanout pixmaps."Keith Packard1-0/+4
This reverts commit 96b4d4787bf82edd9d06eb9a6e94bc45412c7df2.
2011-02-23Revert "Set sprite transforms from RRSetCrtcConfigs"Keith Packard1-2/+2
This reverts commit a88d70fb20a2bc3152b84adff4380857e6cfadf5.
2011-02-23Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"Keith Packard2-80/+31
This reverts commit 752c368421c1c824752cf467fba9318d75d2ca2c.
2011-02-23xfree86: If the driver found modes on an output, don't add moreAdam Jackson1-1/+9
Inferring modes from sync ranges is only valid if the monitor says it's valid. If the monitor says it's valid, then we'll have already added those modes during EDID block parse. If it doesn't, then we should believe it. If there's no EDID for an output, but sync ranges from the config, we'll still add default modes as normal. Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23xfree86: Fix undefined reference to `XNFsprintf' on sparc.Cyril Brulebois1-1/+1
Build failure on sparc: | copying selected object files to avoid basename conflicts... | CCLD Xorg | ./.libs/libxorg.a(xf86sbusBus.o): In function `xf86SbusConfigureNewDev': | […]/hw/xfree86/common/xf86sbusBus.c:712: undefined reference to `XNFsprintf' | collect2: ld returned 1 exit status Fix typo introduced in: 3a9bb93dd178084f4ff1abcea331ca5a62f88ce6 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Apologized-for-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-02-18Merge remote branch 'whot/for-keith'Keith Packard1-1/+1
2011-02-18Replace malloc with calloc to initialize the buffers[] as NULL in ↵Justin Dou1-1/+1
do_get_buffers function The calling for allocate_or_reuse_buffer may fail due to some reason, e.g. out of memory. If the buffers[] were not initialized to be NULL, the following err_out may try to access an illegal memory, which will cause X crash afterward. Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Justin Dou <Justin.Dou@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-18Merge remote branch 'ajax/for-keithp'Keith Packard4-57/+4
2011-02-16xfree86: fix up an out-of-date comment.Peter Hutterer1-1/+1
InitInput simply initialises all input devices now. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com>
2011-02-08xfree86: warning fixAdam Jackson1-1/+0
Did you know that anonymous enums with function scope will not only override the enum values from global scope, but will be treated as entirely different types? C's type system just rules. xf86Crtc.c: In function 'handle_detailed_monrec': xf86Crtc.c:1555:33: warning: comparison between 'enum det_monrec_source' and 'enum <anonymous>' xf86Crtc.c:1562:33: warning: comparison between 'enum det_monrec_source' and 'enum <anonymous>' Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-08fbdevhw: Remove the non-sysfs hack for mapping from PCI to fbdevAdam Jackson1-54/+2
It's broken for devices with BARs above 4G, and the sysfs method should work everywhere anyway. As a pleasant side effect, this fixes some warnings: fbdevhw.c: In function 'fbdev_open_pci': fbdevhw.c:333:4: warning: cast from pointer to integer of different size fbdevhw.c:334:4: warning: cast from pointer to integer of different size fbdevhw.c:336:4: warning: cast from pointer to integer of different size fbdevhw.c:337:4: warning: cast from pointer to integer of different size Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-08int10: warning fixAdam Jackson1-1/+1
helper_exec.c: In function 'pciCfg1in': helper_exec.c:507:4: warning: passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type /usr/include/pciaccess.h:153:5: note: expected 'uint32_t *' but argument is of type 'CARD32 *' Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-08xf86vidmode: warning fixAdam Jackson1-1/+1
xf86VidMode.c: In function 'VidModeGetMonitorValue': xf86VidMode.c:637:19: warning: 'ret.i' may be used uninitialized in this function Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-03xf86/xv: Only register PostValidateTree hook when there is work to doPauli Nieminen1-7/+11
If none of Xv ports were affected by window tree modifications we don't want scan the port list. To avoid useless scanning of port list PostValidateTree hook is only registered when ClipNotify was called for any port. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-03xf86/xv: Use PostValidateTree to do reputPauli Nieminen2-14/+42
ValidateTree calls first ClipNotify and later might call WindowExposures. To avoid useless double reput ClipNotify delays reput to WindowExposures or PostValidateTree. PostValidatTree checks all ports if there is clip changes. On clip changes reput is done to move or scale the overlay. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-03xf86/xv: Fill color key on exposePauli Nieminen3-6/+76
If window gets exposed but clipboxes doesn't change drivers would avoid color key fill. This makes XResizeWindo&co to lose colorkey if background is painted. To help drivers to avoid filling colorkey for each put server can provide helper function if there is exposed areas. Server can subtract exposed areas from filled region. As a side effect we can avoid useless color key fills if window only moves in screen without background fills. v3: * Change tracking to filled area to account for client initiated clip changes * Make overlaid XvPutImage behavior like textured XvPutImage or PutImage * Make region dynamically allocated only when required. v4: * Simplify new driver interface to reduce duplicate code Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-03xf86/xv: Remove unused variable from XvPortRecPrivatePauli Nieminen1-1/+0
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-03xf86/xv: Remove unused GC pointersPauli Nieminen2-12/+0
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-03xf86/xv: Remove copy paste code.Pauli Nieminen1-57/+11
xf86XVFillKeyHelperDrawable can be used to implement xf86XVFillKeyHelper. V2: * Remove RegionTranslate that clobbered parameter region. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
2011-02-02Merge remote branch 'whot/for-keith'Keith Packard4-46/+37
2011-02-02xfree86/modes: Be sure to only use new EDID for physical output dimensionsEvan Broder1-0/+2
The EDID processing regards physical dimensions of 0mm x 0mm as invalid. Previously the old values for height and width would be preserved if none of the physical dimension specifications in the new EDID were considered valid. This will come up in particular if first a monitor is connected to an output, and then a projector is connected. Since projectors generally report physical dimensions of 0mm x 0mm, this would result in the projector claiming to have the physical dimensions of the monitor. Signed-off-by: Evan Broder <ebroder@mokafive.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-02Merge remote branch 'dbn/build-fixes'Keith Packard1-3/+4
2011-01-27xfree86/dga: Remove DGAIsDgaEvent()Ville Syrjala2-13/+0
DGAIsDgaEvent() is not used anymore. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Only send DGA events for master devicesVille Syrjala1-0/+3
Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Remove useless ifdefsVille Syrjala1-13/+7
Move some variables to the scope where they are used. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: DGAProcessKeyboardEvent() forgot ET_InternalVille Syrjala1-0/+1
Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Remove DGAMouseX and DGAMouseYVille Syrjala1-13/+0
Previously some sort of absolute coordinates were sent out in the padding of the DGA2 Motion and Button events. DGAMouseX and DGAMouseY were used to keep track of said coordinates. libXxf86dga doesn't use that data for anything, and at least git history didn't show any past usage either. So let's just remove the last remnants of of this mess. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: DGA2 events are missing the dx/dy informationVille Syrjala1-4/+4
Copy dx/dy from the internal event to the DGA2 Motion/Button events. Do the same for Key events for the sake of keeping the code consistent. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Make mieq_install BoolVille Syrjala1-4/+4
mieq_installed is used as a boolean, so why not make it such. Also it's a static variable, so the the explicit zero initialization can be removed. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Remove the ET_DGAEvent handler only if it was installedVille Syrjala1-2/+3
Remove the handler only if it was installed. Also mark it as uninstalled, otherwise it wouldn't get reinstalled after a server reset. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/dga: Install the DGA event handler when DGA2 is usedVille Syrjala1-0/+5
The ET_DGAEvent handler is only installed when a client requests relative events via DGA1. Do it also when a client requests DGA2 events. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86/input: Restore DGAStealKeyEvent()Ville Syrjala1-0/+13
DGA key event support was lost in commit 8da0ff2d51086666d10ca7330d428e8610a4a0e3. Bring it back. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-27xfree86: bump input minor ABIPeter Hutterer1-1/+1
The new valuator_mask_free() call requires a minor bump. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-20Add xorg.conf.d shadow man page pointing to xorg.conf man pageAlan Coopersmith2-1/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Tested-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18xfree86: use sed rather than cpp to perform string substitutionsGaetan Nadon3-317/+314
Makefile.am: there are only 4 string substitutions to be done in this file. SED is much simpler than the C pre processor which adds its own strings which must be substituted by sed, still. xorgconf.cpp: replaced __xconfigfile__ with xorg.conf as this file name is hard coded in the xserver configuration and cannot change. Replace XCOMM with # permanently. Delete cpprules.in as it isn't used anywhere else. Should one need cpprules for real cpp work, there is one in Xquartz from which the the old man pages code have been stripped. Fix trailing spaces. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18man: refactor common code in the man pages makefilesGaetan Nadon4-52/+4
Create a manpages.am makefile snippet in the root dir. Each man page makefile includes manpages.am. Now all man pages in xserver are generated the same way using the same method as all of other xorg modules. All ".man.pre" files in git are ".man" now. Links are no longer created between different file types. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18exa: build man pages using XORG_MANPAGE_SECTIONSGaetan Nadon4-16/+15
Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Fix trailing whitespaces Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18fbdevhw: build man pages using XORG_MANPAGE_SECTIONSGaetan Nadon4-15/+16
Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Fix trailing whitespaces Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18XFree86 utils: build utils man pages using XORG_MANPAGE_SECTIONSGaetan Nadon8-31/+13
Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Fix trailing whitespaces Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18man: build Xorg and xorg.conf man pages using XORG_MANPAGE_SECTIONSGaetan Nadon4-25/+22
Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-01-18Xorg.man: fix whitespace issuesGaetan Nadon1-7/+7
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>