xf86-video-mga: Changes to 'pci-rework'
Ian Romanick
idr at kemper.freedesktop.org
Tue Dec 12 01:29:02 EET 2006
.gitignore | 1
ChangeLog | 117 -------
Makefile.am | 10
configure.ac | 52 +++
man/mga.man | 15 -
src/Makefile.am | 11
src/mga.h | 69 ++++
src/mga_dacG.c | 46 +--
src/mga_dh.c | 106 +------
src/mga_dri.c | 32 +-
src/mga_driver.c | 127 ++++++--
src/mga_exa.c | 811 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/mga_macros.h | 3
src/mga_merge.c | 27 +
src/mga_reg.h | 170 ++++++++++-
src/mga_storm.c | 104 ++++---
src/mga_video.c | 198 +++++++++----
util/Makefile.am | 2
18 files changed, 1506 insertions(+), 395 deletions(-)
New commits:
commit cb103a18067adb3256c0b791255ce8435ff57e06
Merge: d0e0362... 4bcfca9...
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Dec 11 15:06:19 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit d0e03622811fd94c830c0b5233ff505392c0d331
Merge: 8fee907... 1dd6e69...
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Dec 11 15:06:03 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
Conflicts:
src/mga_macros.h
commit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Dec 10 14:33:10 2006 +0100
Replaced some more magic values with register names.
commit 55d283a8c2347e809dadace3fb9a026bab6d57dd
Author: Daniel Stone <daniel at fooishbar.org>
Date: Wed Dec 6 18:46:00 2006 +0200
Makefile.am: fix ChangeLog hook
Make ChangeLog hook safe for all situations I could think of, including
carrying the ChangeLog through for distcheck when objdir != srcdir. It's
significantly more ugly, but eh.
commit fbbbb853041ae4af36eeffb24188b9a5513ba7d5
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Dec 2 12:42:34 2006 +0100
Removed a duplicated register definition.
commit 447aae84d07cab34987ab08ead9319e176ccd904
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Dec 1 20:19:13 2006 +0100
More janitoring work.
Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions
to mga_reg.h.
Cleaned up the DAC2 routing.
commit 10b2202c254b71b8d0da987a225d5e78a030bca4
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Dec 1 19:10:55 2006 +0100
Use the XORG_RELEASE_VERSION autoconf macro.
commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a
Author: Daniel Stone <daniel at fooishbar.org>
Date: Thu Nov 30 19:59:38 2006 +0200
bump to 1.4.5
commit 5bbafd77678a2b0f82e820aa98337a014d284554
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 26 18:06:12 2006 +0100
Made some XAA function static.
commit 4778901bb13a950285c55ea6f058e94ee7b03652
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 26 16:21:34 2006 +0100
Removed a duplicated register definition.
commit f9d83ad601c8cba197e96f0b907f1dae6134953b
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 26 16:17:12 2006 +0100
Replaced more magic values with register names.
commit 6df85941ce077e1eee8b43945c51ab1b0906c758
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 26 15:39:54 2006 +0100
Use register names in MGASaveScreenMerged() rather than magic numbers.
commit b3ee69f6ac058e52d5175f611090baa76eed49f9
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 26 15:24:46 2006 +0100
Register name tweak.
The "DAC power down" register powers down the DAC when it's
set to zero, and enables it when it's set to one.
To avoid confusion, I renamed it.
commit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Nov 25 17:08:15 2006 +0100
Removed some unused defines from mga_reg.h.
commit 334c7237078652722d7dec1c74812af46bfd7c67
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Nov 25 16:42:49 2006 +0100
Removed some duplicated register definitions.
commit be88d58968c604624617f40820dc9a50a92661be
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Nov 19 21:04:01 2006 +0100
Bug #2168: Fix graphics corruptions with Mystique rev 2.
commit daeecb63567fb394654c9e66d64c3c53658f2c7d
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Nov 17 23:08:25 2006 +0100
Enabled the Exa composite hooks on G550.
commit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a
Author: David Nusinow <dnusinow at debian.org>
Date: Mon Nov 6 23:58:06 2006 -0500
Minor typofix that was causing configure to exit with a syntax error
commit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Oct 27 11:53:40 2006 -0700
Bump version to 1.4.4.
commit 19d950e61b2b33052e52c33add8e70c29ac9d766
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Oct 27 11:48:35 2006 -0700
Convert tests of pMga->Chipset to tests of single bit flags.
Several places in the driver contain if-statements that test Chipset against
several different values to determine what functionality to use. Some of
these tests, HALCHIPSETS in particular, test as many as 6 different values.
This bloats the code size unnecessarilly. Instead we cache the results of
some of those tests in single bit flags stored in pMga.
These changes are similar to some changes in the pci-rework branch.
commit d28c4a3307984b86e0f3cc68fa48cdc01e307a7c
Author: Ian Romanick <idr at us.ibm.com>
Date: Thu Oct 26 19:52:54 2006 -0700
Fix bug #8666. git-bisect for the win!
Since && takes precedence over ||, put parenthesis around the || block to
make all the operations associate in the intended manner.
commit 041910d3b9f6284b4b8a7df10f284528a7e79d12
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Fri Oct 13 18:33:39 2006 -0400
Bump to 1.4.3
commit 8fee907cac7e5924630e3648bfb72ad9bd021ea8
Merge: 7cecee1... 2fc0ebf...
Author: Ian Romanick <idr at us.ibm.com>
Date: Tue Oct 10 11:43:52 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit 2fc0ebfbe850c138e840b6653ed1476623aa04a4
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 28 18:39:20 2006 +0200
Make the DUALSTAGE0 code slightly easier to read.
commit ddd93ae96c5427d4c8d03eb225b66a1a93fa2bc8
Author: David Nusinow <dnusinow at debian.org>
Date: Wed Sep 20 20:42:12 2006 -0400
Minor manpage typofixes. Patch by A. Costa (see Debian bug #364558)
commit 34ec93796e4be31d95d1ed507660c65a2c60fa43
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 21:05:16 2006 +0200
Unbreak the build: MGAStormSync() is required by mga_dga.c.
commit 954c8d06f2697d4f764583dd3336b4cc266b90fd
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 20:51:36 2006 +0200
Removed the XAA atype tables.
Added a FIXME on BLK support for GXcopy instead.
commit ecc155e27b6566196e56de241ae81266e03dc90e
Merge: e7b36c6... 2e73c29...
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 20:43:55 2006 +0200
Merge branch 'exa'
commit 2e73c2989e6cf0f24f8b0c4ae372f0c44dc19755
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 20:41:18 2006 +0200
Documented the AccelMethod option (copied from Radeon's man page).
commit 3f4c12a388af05995273c9abe742f82f84e558a8
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 20:36:18 2006 +0200
Removed the DFS stub.
commit 69cc0060d9516d5fba5fa46607a993f3ebfd5d89
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 20 20:26:37 2006 +0200
Fall back to software rendering for A8 add A8.
commit e7b36c66852077ffbbffdd20e39ed4b6f24541b7
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Sep 18 11:08:51 2006 -0700
Bump version to 1.4.2. Bump required server version to 1.1.0 (X.org 7.1)
from pre-1.1.0 version.
commit 5830edf81a0c0119bd2486b48e56fdb9daf72586
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 16 23:59:32 2006 +0200
Generate ChangeLog from git.
commit 3b2a7b1faf142d4301c55b8951657e177b5ac118
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 16 23:06:36 2006 +0200
Don't install stormdwg.
commit 3d7c109c4864f021590c3bcf0f09685498225dde
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 16 22:31:02 2006 +0200
Enable the BYPASS332 and NODITHER flags when writing to 8 bpp dests.
Thanks to Ville Syrjälä, who noticed these were missing.
Note that this messes up glyph compositing (A8 add A8) pretty much, but
I don't know what's really going on there yet.
commit 2eae7c98fcd3f452f9b9c2eef4a9cf820edf69aa
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Sep 15 16:01:28 2006 +0200
More DUALSTAGE0 fixes related to A8 writes.
When writing from a texture without an alpha channel to an A8 texture,
we now set the alpha channel to 0xff via FCOL.
commit b1031689212bfbbe832dd73337ea8cd5d66ae2ff
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Sep 15 13:43:55 2006 +0200
Reworked DUALSTAGE0 setup.
If we're copying from A8 to A8, we need to replicate the alpha to
the color channels.
commit 965faa3661f73a1d4cbf6368458244dff45a76ad
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 13 14:56:29 2006 +0200
Only use the source texture's alpha channel if it actually has one.
commit 14202e7c47326e8678bf38a6bda63d608f1f152b
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Mon Sep 11 14:22:24 2006 +0200
Support masks without alpha.
commit 35651deb8fc3b8b7b0cf4895732f2edeecdabeb7
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Sep 10 00:56:10 2006 +0200
Fixed the remaining MGAAllocateMemory() issues.
commit d5e9270acf2f914fe7603225ac605cd29830bed6
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Sep 10 00:04:48 2006 +0200
Fixed the engine sync needed for TexturedVideo.
commit 7739a929100d516e06646a38062df8da1f33f774
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Sep 10 00:04:21 2006 +0200
The XAA path in MGA_SYNC() now only syncs the engine if NeedToSync is set.
This makes both paths behave the same way.
commit 1a045b37db4c7c606ed056addf52d337dbdeb88d
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 9 23:58:42 2006 +0200
Dont't multiply the retval of MGAAllocateMemory() by cpp again.
commit dfa5807c1f5694728aa92138eb0eab5bd5b8c3d7
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 9 13:24:01 2006 +0200
Make use of MGA_MARK_SYNC.
commit bfb329542377e8e8141c87ed30389de6d7180e06
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Sep 9 13:20:13 2006 +0200
XV works with EXA now (dumb port of the Radeon code).
commit 9fa71aef67df48b59f9d70fddd2725f739d171a9
Author: Tilman Sauerbeck <tilman at hammerfest.(none)>
Date: Sat Sep 9 11:58:32 2006 +0200
Do A8->A8 ops in hardware.
commit 7a7feb251b8172786755ab81b154bbfb7d193dbc
Author: Tilman Sauerbeck <tilman at hammerfest.(none)>
Date: Sat Sep 9 01:16:26 2006 +0200
PrepareSourceTexture() cannot fail.
commit c2545d6e94964fc981746cdf212b5dc9cd4fdd1b
Author: Tilman Sauerbeck <tilman at hammerfest.(none)>
Date: Sat Sep 9 01:14:38 2006 +0200
Implemented pseudo-DMA based UTS.
commit 3969fe1176da9e39b722982889a3cccc0f812e59
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 22:52:26 2006 +0200
Refactored that texture format lookup code into mgaGetTexFormat().
commit ad57c370ba8ffcbf0b7cf404c61ed01bc924ddd5
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 22:21:19 2006 +0200
Use the right dithering mode for r5g5b5 textures.
This makes all of rendercheck's blend tests work.
commit c39749d6e0e967cd12bcc629c3840905e07dd60c
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 18:24:08 2006 +0200
Enable composite hooks on G400/G450 only.
The PCI-IDs aren't ordered, so using ">=" there was totally broken.
I don't know whether the code works on G550 either, so I'm not enabling
it on these cards yet.
commit 0ee922bb4cce012c980c5d6178fe04e86c5cce53
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 17:36:23 2006 +0200
Code cleanup/formatting fixes.
commit 4ed932caa27df8c6a4c58478d3f9b45815de06f5
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 17:21:52 2006 +0200
Moved some FIXMEs.
commit 3b06475096238b3adc3151f27a92d7a8dbbb0231
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Sep 7 17:16:35 2006 +0200
Put my name in mga_exa.c
commit 6391a058b333de306c9b11c6a723cb4457e76c8f
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 16:43:51 2006 +0200
Fixed the non-EXA build.
commit 74e85b19e564927337f23f6de25bb58f309e892b
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 15:38:39 2006 +0200
Enabled alpha filtering.
This doesn't influence rendercheck's test outcome, but helps with
evas_xrender_x11_test.
commit c2490640b4b237239872c5acbde3704e6e1412e9
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 14:36:38 2006 +0200
Code cleanup/formatting fixes.
commit 646a9927b8412b0224e260be46162782e87bf7c4
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 14:24:26 2006 +0200
Don't set TAMASK in TEXCTL.
According to the specs this disables alpha transparency, which we
probably don't want, but the tests say it's good.
commit e7eccaba96e5bc4ff3ddde49b5245cd448bd5d9b
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 11:48:16 2006 +0200
Rendering to (A)BGR isn't supported.
commit 72338321331fe8830d1d95a1c7f4a4fb5f2d9b0a
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Wed Sep 6 10:57:13 2006 +0200
Disabled color keying.
commit 056915493981be3f3b9270334e0f992a290dfab6
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Mon Aug 28 22:19:23 2006 +0200
Make this code a little more readable.
commit b8320d198abe0cd26b2f76b9add634ef8245ba27
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Aug 27 16:22:50 2006 +0200
Minor code cleanup.
commit c525a7e73ac2ef18933d170f8497351d62e5b1ce
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Aug 27 15:22:58 2006 +0200
Fixed a typo.
commit e0f76b32992274faa0adb39dfd6df0fc3b434e96
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Aug 27 12:44:16 2006 +0200
Documented the mgaBlendOp array.
commit 5982e8200270d25a57da8ab0d1a8290cfaec070c
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sun Aug 27 12:27:59 2006 +0200
Cleaned up the XAA code a bit.
commit e7ba7c993f4e439672810ec9ce3a24df823051a4
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 22:33:25 2006 +0200
Enable composite hooks on G400 or greater.
commit 6c365757891c3e0e0a55c7bea995ef8a4fb3f69c
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 22:32:25 2006 +0200
Added missing mgaSetup() call to the PrepareComposite hook.
commit 2efbc687fcc0d05dca241e4079d9236d9cce0dde
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 22:27:34 2006 +0200
Added a couple of missing newlines.
commit 17153c794d532f27a4248c3f64eba95ede62be87
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 21:42:41 2006 +0200
The texture mapping opcode is 6, not 5.
commit 13f649c65784192c30c18581d8795f3c47060644
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 20:03:36 2006 +0200
Removed ajax' comments on the Copy code, it seems to work well.
commit 4bf16b5f26266132f0c3e9c058df8014d52d56f1
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 18:04:08 2006 +0200
Clean up color/planemask replicating.
commit 5d001aeb21aabde5b6cd919692de726ebaeb3481
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Sat Aug 26 18:00:49 2006 +0200
Fixed alignment values (taken from kdrive).
commit 693f165e2c6c431e6c61c835781883c2bcef5876
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Aug 25 22:40:17 2006 +0200
Fixed corruption on copy, by copying kdrive's waitmarker code.
commit 7fbd85b3621f5368ebce178e5e55b0cbd5a80733
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Fri Aug 25 22:33:06 2006 +0200
MGASelectBuffer() is only need for XAA.
commit 9b24934be499fe5de9fdc02a71e41906c50791d9
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 22:01:19 2006 +0200
Switched the MACCESS code to the stuff from mga_storm.c.
commit 398447c041cffdc712a86f9fe9b58c3f5189c86e
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 21:31:49 2006 +0200
Call exaMarkSync() where we'd set the NeedToSync flag for XAA.
commit b1126b4ab81c12f178fb7366a52b6f2d38af3810
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 21:25:48 2006 +0200
Removed XAA specific code from MGAGetQuiescence.
commit 9141effdbbcd2b3419874ebb4e3898fca3474417
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 20:42:56 2006 +0200
Added another chunk of kdrive code to mgaPrepareSolid().
commit 3f440e499b5d0b073118855fe39fa4077971c06e
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 20:40:51 2006 +0200
Added mgaSetup() from kdrive code.
commit 9285dec527a5f0ec21384b1e079a3878b622a6c2
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 20:03:18 2006 +0200
Disable composite hooks for now, to reduce breakage.
commit db87a5ac8feca5f0126c7af4c51f69222fae7dd9
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 20:02:51 2006 +0200
Wait until the DMA engine is idle in mgaWaitMarker.
commit 84ec0db961de3b10ac02ec5ae6adcec5cc439069
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date: Thu Aug 10 19:49:22 2006 +0200
Initial commit of the Exa bits.
Based on ajax' mga-exa-2.patch with some straight forward fixes
by myself.
More information about the xorg-commit
mailing list