Commit Graph

409 Commits

Author SHA1 Message Date
Eric Anholt e2bb9f38cd Add support for transforms of textures on R128. 2004-07-19 07:20:01 +00:00
Rik Faith c042647278 Addition of console input after removal of core backend input that is not
on screen 0 can cause a segfault. Fix by preventing reinitialization of
    detached inputs. When Xinerama is active and screen 0 is detached,
    pixmaps for XGetImage must be obtained from another screen.
2004-07-18 22:19:33 +00:00
Carlos Romero 3e52373fc8 Enable i810. 2004-07-15 09:56:40 +00:00
Eric Anholt aeb78eaa98 Commit the rest of the dirty optimization from 20040703 and add a missing
header include. I don't know how this happened, but I'm going to blame
    a "few" fscks having happened between testing the code and committing
    (due to other driver changes that made me not blame dirty for the
    failures I saw) for disappearance of kasync.c changes. Fixes a lot of
    corruption.
2004-07-08 08:21:25 +00:00
Eric Anholt b467673528 Remove duplicate protos in kdrive.h. 2004-07-08 06:57:58 +00:00
Carlos Romero 764d9e822b missing xkb/[xkb.h, xkbDflts.h] and hw/kdrive/mga/g400_common.h 2004-07-07 20:43:25 +00:00
Carlos Romero f96ef08d48 Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput 2004-07-07 19:21:07 +00:00
Rik Faith a5c9b3229c Bugzilla #817 2004-07-07 04:32:52 +00:00
Kevin E Martin 1498d7a096 - Disable building DMX on OSs that have not been verified to build
correctly (Kevin Martin).
- Fix DMX build when Xinerama is not enabled (Kevin Martin).
2004-07-06 23:51:00 +00:00
Egbert Eich 0e45f2a753 ifdef'ed some IA32-only assembler statements. Presently these chipsets are
IA32 only, anyway (Egbert Eich).
Disabling generic VGA testing for IA64 architectures. Temporarily disabling
    support for ZX1 bus. This code is extremely invasive and is executed as
    fallback without testing for a ZX1 chipset. It brings a SGI Altrix to a
    grinding halt. (Egbert Eich).
2004-07-06 14:49:13 +00:00
Egbert Eich df2b55a25b Separated Intel drivers from default DriDrivers to avoid building them on
IA64 (Egbert Eich).
Fixed wrong function prototype (Egbert Eich).
Don't test for generic VGA on IA64 (Egbert Eich).
Fixed a segfault when accessing a structure before verifying the pointer
    exists (Egbert Eich).
Added a showcache option for debugging (Egbert Eich).
Increase default video RAM size to 16MB when DRI is enabled and more than
    128MB are available (Egbert Eich). Fixed lockups during mode switch.
    Problem was introduced when attempting to copy the behavior during
    LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before
    I810DRIEnter(). The entire DRILeave()/Enter() scenario has been
    commented out as it didn't seem to be necessary (Egbert Eich).
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
increased MAX_DEVICES to 128 (Egbert Eich).
Use OS provided PCI config space access as default method (Egbert Eich).
Added support for Linux 2.6 proc file format.
Fixed unaligned accesses to pieces of the VBE info block. VESA did not
    align elements to size (Egbert Eich).
2004-07-06 14:37:48 +00:00
Eric Anholt 7c466d64c3 Clean up Rage 128 composite code. Now it composites more operations
correctly and is simpler.
2004-07-03 10:23:03 +00:00
Eric Anholt 0207015669 Add a "dirty" flag to the pixmap private. Clear it when setting up an
offscreen pixmap area, and set it when any rendering occurs. When
    moving a pixmap out of offscreen, don't read data back if it wasn't
    dirtied (compared to the system memory copy).
2004-07-03 09:16:30 +00:00
Phil Blundell fd594b0559 Call ts_read multiple times, to avoid events getting stuck in the pipeline. 2004-07-02 21:30:00 +00:00
Kevin E Martin 7976ee51af Add Distributed Multihead X (DMX) support 2004-06-30 20:06:56 +00:00
Eric Anholt d5db59bd79 Add an offscreen area scoring to improve choosing offscreen areas to kick
out when allocation can't find a free area of the requested size. When
    offscreen pixmaps get used, the offscreen area's score is increased by
    a constant value. Every certain number of increases, all offscreen area
    scores get decreased by a fraction. When choosing a set of areas to
    remove for a new allocation, the set of areas with the smallest total
    score is chosen for removal. While this is not the smartest system, it
    prevents things like always removing the first offscreen area in memory
    (likely the most recent) to be kicked out when doing replacing.
2004-06-29 20:37:51 +00:00
Alan Coopersmith ea78d1c6fc Add GLX_ALIAS_VOID for GLX_ALIAS of functions with return type void to fix
builds with non-gcc compilers that refuse to let you do return
    function_that_returns_void(...)
programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c Remove includes
    of xf86drm.h that break non-DRI builds
2004-06-28 18:08:26 +00:00
Keith Packard 7ff67f2872 Separate out off-screen allocation from Init. Fix Enable to update
off-screen addresses. Wrap RandR to update off-screen addresses.
Set off_screen_base and memory_size fields correctly.
2004-06-28 00:48:51 +00:00
Keith Packard 5b75aae2cf Add ARGB cursor support for Radeon cards. 2004-06-26 04:13:03 +00:00
Alexander Gottwald ed7f92e791 Bug 778: add ddxBeforeReset 2004-06-21 13:44:14 +00:00
Alexander Gottwald d6e8b1affe Bug 777: Merge from CYGWIN branch 2004-06-21 13:19:32 +00:00
Damien Ciabrini da78a4ddd8 Update MGA composite patch commit. (some files were missing in the previous
commit)
2004-06-16 21:36:54 +00:00
Eric Anholt e56e24af25 Merge DRI-trunk-20040613 changes in programs/Xserver/GL. 2004-06-16 09:37:59 +00:00
Eric Anholt 2e1868b560 DRI trunk-20040613 import 2004-06-16 09:25:21 +00:00
Eric Anholt 22bad9474b DRI XFree86-4_3_99_12-merge import 2004-06-16 09:22:17 +00:00
Eric Anholt 1c133c27cc Initial revision 2004-06-16 09:22:05 +00:00
Eric Anholt bcc1eab1fd Initial revision 2004-06-16 09:16:01 +00:00
Jaymz Julian 580b9a7da1 MGA composite support from Damien Ciabrini - thanks! 2004-06-14 08:43:57 +00:00
Alan Coopersmith 95d65cf6bb Manual page X(7) does not reference Xprt(1x), xplsprinters(1x), etc.
xc/config/cf/Imake.rules Correct comment to match rule name for
    InstallDriverSDKObjectModule
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c Log results of
    ioctls to probe keyboard type & layout
2004-06-13 04:50:21 +00:00
Eric Anholt 4ffde8a6b3 - Pass the right pixel mask (all ones) in to PrepareSolid in the
solid-fill-based composite acceleration.
- Use a real pixmap when doing an UploadToScratch (For pDrawable->type ==
    DRAWABLE_WINDOW, you need to get the backing pixmap).
- Pass back the x/y offsets from kaaGetOffscreenPixmap unconditionally,
    because they'll be used in the scratch case.
- Turn on the Render acceleration for Rage 128 and Radeon 100-series at
    last!
2004-06-10 19:22:58 +00:00
Eric Anholt c3bc6dd551 Align scratch area offsets to the offscreen byte alignment. 2004-06-10 09:50:59 +00:00
Eric Anholt cf3f95d216 Oops, testers reported that the last patch actually didn't work (conflicts
occurred), so the R300 PDMA doesn't work. Disable.
2004-06-10 08:37:28 +00:00
Eric Anholt 0b7647ee35 Bug #242: Fix setup of R300 cards, by providing R300 CP code from
volodya-project and initializing PDMA.
2004-06-10 05:57:31 +00:00
Franco Catrin L b3a18ca8b8 Neomagic driver enabled 2004-06-07 05:13:29 +00:00
Franco Catrin L 893ea12559 small fixes. README added 2004-06-07 05:05:10 +00:00
Keith Packard d9cca52feb Add (stubbed out) Xgl server code 2004-06-04 17:06:18 +00:00
Keith Packard f8a1dd3ce7 Add top-level build support for GL X server (not working yet)
Fix a few allocation bugs with alternate visual ids Allow for non-8/8/8
    alternate visuals
Turn off any existing shadow before enabling it again (avoids
    re-registering existing damage)
Add some validation code to catch re-registered damages
2004-06-04 16:10:50 +00:00
Phil Blundell 6741fadc52 New conditional. (REQUIRED_MODULES): Demand xcalibrateext if building
XCalibrate.
New file.
Add xcalibrate.c.
Read raw events if requested.
2004-06-02 20:49:50 +00:00
Phil Blundell d4d0c8470c Add -lts if using tslib. 2004-05-30 20:40:30 +00:00
Carlos Romero 8124810950 Initialize permedia engine for acceleration to work. 2004-05-30 13:51:18 +00:00
Ralph Thomas ea1bbf8d83 Adding driver for VIA CLE266 graphics chip. Currently it only accelerates
copy and fill operations.
2004-05-29 12:15:46 +00:00
Daniel Stone 6af411b02e Hey, I like devfs.
Try /dev/fb/0 if /dev/fb0 fails.
2004-05-28 04:56:49 +00:00
Egbert Eich 05a3dbf5dc Updated x86emu and resynced with upsteam at Scitech. 2004-05-26 17:44:29 +00:00
Alan Coopersmith 9549f628e0 getconfig: file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature
(Change "Xorg Project" to "Xorg Foundation" to match getconfig script)
2004-05-25 20:33:46 +00:00
Carlos Romero f8124d3ef5 Add pm2 to the build 2004-05-25 13:02:44 +00:00
Carlos Romero 32d0920ef9 Initial import of Permedia2 driver 2004-05-24 19:31:41 +00:00
Egbert Eich 5b2211ec35 Muffle compiler warnings.
fix option name in log message.
improve debugging messages.
2004-05-24 19:05:01 +00:00
Keith Packard 932efe8e6d Allow for multiple composite-based visuals, then add an RGB24 visual in
addition to the ARGB32 one. This allows 'glitz' to run on top of any X
    server using mesa.
Switch to using 32bpp for depth 24 pixmaps (even when the frame buffer is
    not depth 24).
2004-05-21 03:32:27 +00:00
Keith Packard cde51fd05b Miscomputing pitch in 24bpp modes because of rounding errors. 2004-05-20 19:51:44 +00:00
Keith Packard b9d920f3dc Fix SYNC_ALWAYS (debugging) code to use mach64WaitIdle instead of
KdCheckSync -- the boolean used in the latter won't be set yet.
Oops. == instead of =.
Must sync hardware before rasterizing trapezoids in case the mask is in
    off-screen memory and has just been erased. Yes, it is silly to place
    masks in off-screen memory. That's a separate issue.
2004-05-20 05:27:03 +00:00
Keith Packard 94648799c8 Pin header-only pixmaps in memory.
Off-screen reallocation could have used a stale pointer.
Separate framebuffer mapping computation from actual frame buffer mapping.
    Now map the frame buffer from vesaEnable so that VT switch shares the
    same mapping code. This makes sure any shadow framebuffer is allocated
    again.
2004-05-20 02:42:20 +00:00
Eric Anholt cade317d31 Overhaul of the ATI driver:
- Add monochrome hardware cursor support.
- Try to auto-detect AGP support for DRI on Radeons. And fail. Detect it
    properly on R128.
- Set up card for pseudo-DMA if possible. Convert 2D rendering code to
    prepare DMA packets only. Use generic code to decode DMA packets to
    MMIO if PDMA is unavailable. Add WIP code to support "real" DMA without
    DRM support.
- Dispatch pending DMA commands when the server sleeps. Otherwise some
    things, such as typing in an xterm, wouldn't show up for a time.
- Fix Radeon Composite acceleration in many ways, and add Rage 128
    Composite acceleration. Disable them both due to still-not-understood
    issues they have. They fail with In, Out, AtopReverse, and Xor, and
    text rendering is strange.
- Add textured XV support for R100 and Rage 128. No brightness/sat
    controls, but it does support multiple ports, and cooperates with
    Composite.
- Add WIP code for hostdata uploads.
- Many cleanups and fixes.
2004-05-17 20:18:02 +00:00
Eric Anholt 834537e212 Make kaaMoveInPixmap public. This will be used by the ATI driver's xvideo
support to ensure that the destination is in framebuffer.
2004-05-17 07:19:49 +00:00
Eric Anholt 85f46e0bcd Add new CheckComposite hook. This allows a driver to avoid the migration of
pixmaps for a Composite operation if the operation can't be supported.
    This hook is optional.
2004-05-17 07:14:23 +00:00
Alan Coopersmith fc2dd516c3 xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
- Clean up server name changes from TM branch
- Set default XKB rules file name correctly
- Use default font path from Imake configuration for the default font path
    in generated xorg.conf files.
- Use path variables from Imake configuration for paths to files, in case
    vendor has configured them to install somewhere other than the
    defaults.
2004-05-16 00:03:54 +00:00
Eric Anholt 74b2a76947 Add new flag, KAA_OFFSCREEN_ALIGN_POT, which tells KAA to align pixmap
pitches to a power-of-two number of bytes. Useful for Render
    acceleration on older cards.
2004-05-14 00:34:28 +00:00
Eric Anholt 2bea33e881 Don't let the visible screen get "migrated" offscreen, which manifests
itself as a hang.
Reported by: Ginokas <ginokas@free.fr>
2004-05-14 00:27:29 +00:00
Eric Anholt 40354e7618 Add generic functions for copying packed/planar XV data, copied from
mach64.
2004-05-13 22:57:15 +00:00
Eric Anholt 2e330e980f Move fourcc.h to a generic location in src/. 2004-05-13 21:41:48 +00:00
Keith Packard f52a4d472d Follow GLX in setting ARGB visual nplanes to 24.
Retry current mouse protocol when sync is lost
2004-05-13 21:25:51 +00:00
Eric Anholt aa5a878472 There's no need to explicitly set softCursor -- kdrive handles this if the
cursor hooks aren't set.
2004-05-13 21:15:06 +00:00
Egbert Eich 75d96afcc4 BugZilla #601: Fixing makedepend choking on floating point exception
because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler
    intrinsic define. BugZilla #605: Fixing build on IA64 which is broken
    due to the inclusion of the kernel header asm/page.h. Kernel headers
    however don't work with
-ansi. The inclusion of asm/page.h can however savely be removed as it
    there are plenty of other ways to determine the page size.
2004-05-06 17:31:17 +00:00
Keith Packard 7124cfaa00 Use current resolution by default, change rate to 75 to match
fbdevModeSupported cut-off (?). Glenn McGrath <glennm@hydrix.com>
2004-05-06 16:19:32 +00:00
Keith Packard b5f200ce9d Attached is a patch to fix a build error whe ncompiling with tslib support,
a variable wasnt set, i just changed it to be like the other
    MAkefile.ams :) -- Glenn McGrath <glennm@hydrix.com>
2004-05-04 03:28:06 +00:00
Keith Packard a8429d7610 Add completely fake X server -- draws to allocated buffer, has no keyboard
or mouse.
2004-04-28 07:26:46 +00:00
Egbert Eich 2fb5886200 Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00
Egbert Eich 0664db19bf Merging XORG-CURRENT into trunk 2004-04-23 18:54:16 +00:00
Franco Catrin L 20248eedd6 fixed Changelog format 2004-04-11 16:39:48 +00:00
Franco Catrin L bc7168ee76 Added ROP 2004-04-11 16:24:03 +00:00
Franco Catrin L 784d37ee36 Fixed size calculation in solid rendering 2004-04-11 15:51:04 +00:00
Franco Catrin L 056322336c Basic bitblt implementation 2004-04-11 15:20:17 +00:00
Franco Catrin L c231856a13 First acceleration function implemented (DrawSolid) 2004-04-11 00:53:10 +00:00
Franco Catrin L 47436a8af8 Finnally got MMIO working all timecat ChangeLog cat ChangeLog cat ChangeLog
:-D
2004-04-11 00:15:57 +00:00
Franco Catrin L 1740b938e4 Return back to VESA only version 2004-04-06 18:09:44 +00:00
Franco Catrin L 07bc231872 small fixes, but still can't get this driver woking again 2004-04-05 18:19:34 +00:00
Brent Cook b526276faa removed hardcoded vesa references so we can operate with any backend. fbdev
works for initializing the screen, but input fails shortly after.
2004-04-05 02:52:35 +00:00
Brent Cook 920e6ff81b Begin separating VESA calls into a more generic backend wrapper like the
ati driver, cascading between VESA and FBDEV. We only have init
    functions done so far; need to add all of the others. Fixed some
    compiler warnings. Whitespace and formatting cleanups (using 4 spaces,
    no tabs)
2004-04-04 07:30:07 +00:00
Brent Cook 530371ceaf added touchscreen support, detect all known PCI chips in the Neomagic line.
We'll not bother with ISA for now.
2004-04-03 22:26:37 +00:00
Brent Cook 962b898868 initial import of original driver by Franco Catrin L. Wraps VESA for most
parts, with some hardware acceleration enabled for the cursor on the
    NM2300.
2004-04-03 22:22:48 +00:00
Torrey Lyons f1394ec3ce Change XFree86 Project to X.Org Foundation in localized XDarwin splash
screens.
2004-03-24 22:15:25 +00:00
Torrey Lyons d2bbcc0dee Change XFree86 Project to X.Org Foundation in XDarwin splash screen. 2004-03-24 22:12:34 +00:00
Egbert Eich dae90c3af9 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2004-03-14 08:34:49 +00:00
Daniel Stone 45b638b87f Twenty link errors for Xizzle now - count 'em. 20.
Get rid of all references to SCO.
Change SDK include dir to $(includedir)/xizzle. Add SDK libs where
    necessary.
Reformat to be nicer and easier to shuffle around; also, fix lib ordering
    so we get so much closer to the elusive final link. Shuffle
    common/xf86Init.c into libxizzle.a.
Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK stuff
    conditional as needed; fix the SBus includes.
Name library os-support/libxizzleos.a, not os-support/foo/libxizzlefoo.a.
    Clean up ARCH_SOURCES so it's always initialised to something.
Move linked libraries to _LIBADD, which somehow escaped my attention. Make
    inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.
s/VERSION/VBE_VERSION/;
Axe this redundant dir.
All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
    required modules to be vaguely sane, add some pertinent libs/incs.
2004-03-10 11:49:11 +00:00
Egbert Eich 867451f1ab Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2004-03-03 12:12:50 +00:00
Jaymz Julian 6c412a43e4 sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them. hrm,
    perhaps i should make it have a --i-know-what-i'm-doing param that it
    doens't start without, heh
2004-02-28 09:47:55 +00:00
Egbert Eich df0313d35b readding XFree86's cvs IDs 2004-02-26 13:36:15 +00:00
Egbert Eich 147aae87fd Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2004-02-26 09:23:53 +00:00
Kaleb Keithley 4ee0a53de8 Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."
2004-02-23 20:35:22 +00:00
Kaleb Keithley dcdd47ebbd Initial revision 2004-02-23 20:35:19 +00:00
Warren Turkal a27ffd2678 completely get rid of NeedNestedPrototypes
completely get rid of NeedVarargsPrototypes
remove a lot of NeedFunctionPrototypes
ansify many function declarations
2004-02-18 02:12:44 +00:00
Warren Turkal b146ef1548 Moving toward a working input extension. 2004-02-15 15:04:57 +00:00
Jaymz Julian bd20c8d340 Polling input mode for the kdrive os layer. And a moose! 2004-02-05 09:09:51 +00:00
Jaymz Julian af798d2774 More NULL checks. These ones are more useful than the last (which just made
debugging a bunch of problems easier), since you can implement less in
    the basic simplest case driver now (not that i'm lazy, mind :-p)
2004-02-04 16:08:27 +00:00
Egbert Eich 3c64b65d80 Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 2004-01-29 08:08:57 +00:00
Eric Anholt 2ec70aa701 Disable GLX visuals code on !GLXEXT, and remove a useless prototype. 2004-01-25 05:31:24 +00:00
Eric Anholt 01e9cc858a - Add glx visuals code based on XFree86's Radeon driver.
- Reserve areas for back/depth/span when USING_DRI && GLXEXT. This would be
    better in a TransitionTo3d, but we'd need to work with the offscreen
    memory manager for that.
- Misc. fixes to ati_dri.c for DRI+GLX. Needs more work still.
2004-01-25 01:30:33 +00:00
Eric Anholt f2bedd17af Oops, turn fallback output back off. 2004-01-25 01:16:19 +00:00
Eric Anholt 26c5a8dfdd Whitespace cleanup. 2004-01-25 01:04:12 +00:00
Keith Packard 6870c08157 Oops, lost a diff needed for the non-screen format pixmap code 2004-01-15 09:19:56 +00:00
Keith Packard 3867e03cb6 Fix up some mis-used variable names 2004-01-15 09:15:53 +00:00