summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2010-12-02Merge remote branch 'vsyrjala/xv_reput'Keith Packard5-107/+175
2010-12-01Fix screen number checks.Cyril Brulebois3-5/+5
screenInfo.numScreens is not a valid screen number, they go from 0 to numScreens - 1. Signed-off-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-01DGA: fix screen number checkJulien Cristau1-23/+23
screenInfo.numScreens is not a valid screen number, they go from 0 to numScreens - 1. Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-11-30Merge remote branch 'ajax/for-keithp'Keith Packard26-879/+26
2010-11-30Merge remote branch 'aplattner/for/keith'Keith Packard1-19/+43
2010-11-30xfree86: Bump classic driver default to 1024x768Adam Jackson1-5/+16
Signed-off-by: Adam Jackson <ajax@redhat.com> 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>
2010-11-30xfree86: Remove the xf8_16bpp overlay moduleAdam Jackson6-142/+2
Only one (marginal) driver was using it, and it's been fixed to just implement it directly. v2: Also fix sdksyms.sh (spotted by Jesse Adkins) v3: Also fix DESIGN.xml (spotted bu Julien Cristau) Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30vbe: Refuse to believe tiny (or negative) panel sizes from PanelIDAdam Jackson1-0/+5
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30xfree86: Remove unused xf86PixmapKeyRecAdam Jackson3-6/+1
Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30dix: Remove the backing store leftoversAdam Jackson8-50/+0
Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30render: repack PictureRecAdam Jackson1-2/+0
Eliminate the unused dither field, move filter and stateChanges into the bitfield, and reorder elements to pack holes on LP64. sizeof(PictureRec) ILP32 LP64 before: 84 152 after: 72 120 Reviewed-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30xfree86: Fix rotation of 2-color non-interleaved cursor imagesAaron Plattner1-19/+43
When RandR 1.2's transformation code is enabled, it rotates the cursor image so that it appears upright on a rotated screen. This code completely mangles 2-color cursors on hardware where the the mask and source images are not interleaved due to two problems: 1. stride is calculated as (width / 4) rather than (width / 8), so the expression (y * stride) skips two lines instead of one for every time y is incremented. 2. cursor_bitpos ignores the 'mask' parameter if the hardware doesn't specify any of the HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_* flags. To fix this, refactor the code to pass the whole xf86CursorInfoPtr through to cursor_bitpos and compute the correct stride there based on the flags. If none of the SOURCE_MASK_INTERLEAVE flags are set, use the total cursor size to move the 'image' variable into the mask part of the image before computing the desired byte pointer. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Tested-by: Cyril Brulebois <kibi@debian.org>
2010-11-30linux: Refactor VT switch on {re,}generation and shutdownAdam Jackson1-24/+14
This makes more things fatal than were fatal before, but that's correct; if you need the VT, then failing to get it on regeneration means things are about to go very very badly. Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30xfree86: Remove dead ifdefs from VT switchingAdam Jackson1-15/+0
Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30linux: Don't muck about with tty permissionsAdam Jackson1-62/+0
This is not X's job. Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30xfree86: Remove os-support/sysvAdam Jackson4-569/+1
Nothing's using it, the SysV derivatives we support have their own custom versions. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30linux: Remove redundant variableAdam Jackson1-5/+3
Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-30glx: Remove swap barrier and hyperpipe supportAdam Jackson2-4/+0
Never implemented in any open source driver. The implementation assumed explicit DDX driver knowledge of how the client-side driver worked, since at the time the server's GL renderer was not a DRI driver. But now, it is, so any implementation of these should be done with additional DRI driver API, like the swap control extension. Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-11-26xfree86/xv: Provide a ModeSet hookVille Syrjälä2-0/+25
Reput all ports when the display mode or panning has been changed by RandR code. This makes the overlays appear in the correct position on the screen. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/modes: Provide a ModeSet hook in ScrnInfoVille Syrjälä2-1/+11
Add a new hook ModeSet that will be called after display mode is changed, or after the display has been panned. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Pass all coordinate arguments to ReputImageVille Syrjälä2-1/+10
Pass all of the src/dst coordinates to ReputImage so that drivers don't necessarily have to do double bookkeeping. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Document VIDEO_CLIP_TO_VIEWPORT incompatibility with reputVille Syrjälä1-0/+4
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Add some helpful comments about ReputImageVille Syrjälä2-2/+3
Document the fact that ReputImage is used for stills as well as images. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Fix ReputImage clippingVille Syrjälä1-0/+38
PutImage/PutStill respect the GC clip, however ReputImage does not. PutImage/PutStill are supposed to be oneshot operations so ReputImage should never expand the area covered by the clip, instead it should only shrink if the window clip shrinks. So commandeer clientClip into use by ReputImage and initially make it a copy of the original GC composite clip. Whenever ReputImage needs reclipping update clientClip with the newly calculated composite clip. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Remove clipOrg from XvPortRecPrivateVille Syrjälä2-4/+3
clipOrg never changes except when clientClip changes, so instead of keeping copies of both originals translate clientClip by clipOrg immediately and just keep the translated clientClip. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Factor out the meat of xf86XVAdjustFrame for later reuseVille Syrjälä1-31/+35
No functional change. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Change the behaviour of AdjustFrame to reput everythingVille Syrjälä1-15/+17
Also reput PutVideo/GetVideo ports in AdjustFrame. This makes the overlay track the screen panning instead of staying stationary in the wrong place. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: No need to free composite clip in AdjustFrameVille Syrjälä1-6/+0
Nothing should change in AdjustFrame that would need the composite clip to be recomputed. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Change the behaviour of ClipNotify to reput instead of stopVille Syrjälä1-18/+10
When ClipNotify gets called for a visible window, reput instead of stopping the port. This eliminates nasty overlay flickering that happens during clip changes. If the window is invisible or if ReputImage isn't supported stop and remove the port from the window as was done before. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Allow xf86XVReputOrStopPort() to stop PutVideo/GetVideo portsVille Syrjälä1-10/+23
Modify xf86XVReputOrStopPort() to allow stopping of all types of ports. Will be useful later. No functional change. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Factor out the meat of xf86XVWindowExposures for later reuseVille Syrjälä1-25/+28
No fucntional change. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Eliminate two open coded copies of xf86XVRemovePortFromWindowVille Syrjälä1-25/+2
No functional change. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-26xfree86/xv: Remove useless NULL check from ClipNotifyVille Syrjälä1-3/+0
WinPriv->PortRec should never be NULL as WinPriv itself would be removed from the list when the port is removed from the window. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
2010-11-24Merge remote branch 'whot/for-keith'Keith Packard2-2/+6
2010-11-24Merge remote branch 'jeremyhu/master'Keith Packard24-273/+212
2010-11-24doc: refactor Makefile and xmlrules.in code for reusabilityGaetan Nadon2-12/+6
A different approach which requires less variables setting and internal knowledge of the reused code. Changing from "install" to "not install" is very easy now. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-11-24xmlrules.in: use $(top_srcdir) rather than ../../../ [...]Gaetan Nadon2-2/+2
Relative paths don't always work in distcheck when srcdir not = builddir include $(top_srcdir)/doc/xml/xmlrules.in Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-11-24Xorg.man: Replace XDarwin reference with XquartzAlan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-11-24xfree86: store the screen's gamma information on init.Bill Nottingham1-0/+4
This fixes a gamma issue on vt switch observed with KDM. VT switching away and back would result in a black screen. Avoid this by storing the current gamma information on init. https://bugzilla.redhat.com/show_bug.cgi?id=533217 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>
2010-11-24xfree86: apply gamma settings on EnterVT.Adam Jackson1-0/+6
When entering the VT, re-apply the saved gamma settings for each screen. 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>
2010-11-24XQuartz: Remove unused CloseInputDevice stubJeremy Huddleston1-19/+0
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-24xfree86: add missing linebreak in error message.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
2010-11-22XQuartz: Localization UpdatesJeremy Huddleston20-141/+164
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-22XQuartz: Remove existing localization files on install to avoid conflictsJeremy Huddleston1-1/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-22XQuartz dri: Don't check CoreGraphics versionJeremy Huddleston1-112/+0
The version check is hackish, and I highly doubt anyone using this code is on a version of OS X that predates this support (10.2 has support for it). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-22XQuartz: Add pointer debuggingJeremy Huddleston1-0/+46
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-19linux: Fix CPU usage bug in console fd flushingAdam Jackson1-1/+5
If the vt gets a vhangup from under us, then the tty will appear ready in select(), but trying to tcflush() it will return -EIO, so we'll spin around at 100% CPU for no reason. Notice this condition and unregister the handler if it happens. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-15Merge remote branch 'whot/for-keith'Keith Packard2-1/+2
2010-11-15Merge remote branch 'jeremyhu/master'Keith Packard1-1/+3
2010-11-15Merge remote branch 'adkins/master'Keith Packard3-9/+0