ChangeLog revision fe5e51b7
1fe5e51b7Smrgcommit e50a99877b2870746266b799b0a6411b2214a3de 2fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 3fe5e51b7SmrgDate: Fri Jan 18 19:31:40 2008 +0100 4fe5e51b7Smrg 5fe5e51b7Smrg Bumped version to 1.4.8. 6fe5e51b7Smrg 7fe5e51b7Smrgcommit bfee7bf011625079fd79b1bf89198ffeb76096d2 8fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 9fe5e51b7SmrgDate: Fri Jan 18 18:05:49 2008 +0100 10fe5e51b7Smrg 11fe5e51b7Smrg Bug #13926: Unbreak Xinerama. 12fe5e51b7Smrg 13fe5e51b7Smrgcommit 2096022c0757b675d39dea8830125ba800b43160 14fe5e51b7SmrgAuthor: Adam Jackson <ajax@redhat.com> 15fe5e51b7SmrgDate: Wed Dec 12 18:10:52 2007 -0500 16fe5e51b7Smrg 17fe5e51b7Smrg G200SE-A can't cope with bigger than 1600x1200. 18fe5e51b7Smrg 19fe5e51b7Smrgcommit 81717e5780350665166dd7a0f4d96135609a8764 20fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 21fe5e51b7SmrgDate: Tue Oct 30 18:43:30 2007 -0700 22fe5e51b7Smrg 23fe5e51b7Smrg Don't build or call init_dri if XF86DRI is undefined 24fe5e51b7Smrg 25fe5e51b7Smrgcommit db22b6ef0fa3ae20f46719bd826e16b6580e5213 26fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 27fe5e51b7SmrgDate: Wed Oct 3 23:06:48 2007 +0200 28fe5e51b7Smrg 29fe5e51b7Smrg Fixed a typo. 30fe5e51b7Smrg 31fe5e51b7Smrgcommit 8e971287f60f3a41f2d0d176e4eaaa653e25276b 32fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 33fe5e51b7SmrgDate: Wed Oct 3 12:47:59 2007 -0700 34fe5e51b7Smrg 35fe5e51b7Smrg Unmap the same size that was mapped 36fe5e51b7Smrg 37fe5e51b7Smrg Make sure the same size is used with pci_device_unmap_range as was used with 38fe5e51b7Smrg pci_device_map_range. Failing to do so was causing problems with a G450 39fe5e51b7Smrg card in a POWER6 box. 40fe5e51b7Smrg 41fe5e51b7Smrg Based on a patch submitted by Anton Blanchard. 42fe5e51b7Smrg 43fe5e51b7Smrgcommit 10d452ad86b4798f3ded6c4c2446f08aaab6af00 44fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 45fe5e51b7SmrgDate: Sat Sep 15 00:16:16 2007 +0200 46fe5e51b7Smrg 47fe5e51b7Smrg Oops, don't access the "memory" field in struct pci_mem_region either. 48fe5e51b7Smrg 49fe5e51b7Smrgcommit 485fb9aa1e5d90c75d763db4b7bf5a80e51e83e9 50fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 51fe5e51b7SmrgDate: Fri Sep 14 23:10:09 2007 +0200 52fe5e51b7Smrg 53fe5e51b7Smrg Use pci_device_map_range() instead of pci_device_map_region(). 54fe5e51b7Smrg 55fe5e51b7Smrg Likewise for pci_device_unmap_region(). 56fe5e51b7Smrg 57fe5e51b7Smrgcommit d7f0f657504b2646a94f652baf0f71ff4117fac4 58fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 59fe5e51b7SmrgDate: Wed Sep 5 18:06:57 2007 +0200 60fe5e51b7Smrg 61fe5e51b7Smrg Bumped version to 1.4.7. 62fe5e51b7Smrg 63fe5e51b7Smrgcommit 6fde3fd6d34e7252ee16422b19896d71b1622039 64fe5e51b7SmrgMerge: 4bfc1e1... 923176f... 65fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com> 66fe5e51b7SmrgDate: Mon Sep 3 06:07:32 2007 -0400 67fe5e51b7Smrg 68fe5e51b7Smrg Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga 69fe5e51b7Smrg 70fe5e51b7Smrgcommit 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3 71fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com> 72fe5e51b7SmrgDate: Mon Sep 3 05:52:35 2007 -0400 73fe5e51b7Smrg 74fe5e51b7Smrg Add *~ to .gitignore to skip patch/emacs droppings 75fe5e51b7Smrg 76fe5e51b7Smrgcommit 923176f5aad777b4023003a457bb77da21373389 77fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 78fe5e51b7SmrgDate: Fri Aug 31 11:05:57 2007 -0700 79fe5e51b7Smrg 80fe5e51b7Smrg Use XSERVER_LIBPCIACCESS to detect pci-rework. 81fe5e51b7Smrg 82fe5e51b7Smrgcommit 90beb8c27b4206b593898d346bf37ab49e75b975 83fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 84fe5e51b7SmrgDate: Wed Aug 22 11:19:46 2007 -0700 85fe5e51b7Smrg 86fe5e51b7Smrg Set pScrn to NULL before calling xf86ConfigPciEntity. 87fe5e51b7Smrg 88fe5e51b7Smrg Why is the interface to xf86ConfigPciEntity so filled with hate? 89fe5e51b7Smrg 90fe5e51b7Smrgcommit 55d219394ad6af8e25ff604bcbb49d5a551bd348 91fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 92fe5e51b7SmrgDate: Wed Aug 22 10:43:39 2007 -0700 93fe5e51b7Smrg 94fe5e51b7Smrg Merge PCI-rework support and "classic" PCI interface support into one tree 95fe5e51b7Smrg 96fe5e51b7Smrg First pass at merging both trees. So far, this has only been tested 97fe5e51b7Smrg on the PCI-rework build on a PCI G450. 98fe5e51b7Smrg 99fe5e51b7Smrgcommit f4ef39d53d5a67942707507814fef4ad466dc909 100fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 101fe5e51b7SmrgDate: Mon Aug 20 15:36:57 2007 -0700 102fe5e51b7Smrg 103fe5e51b7Smrg Fix compile error introduced by merge. 104fe5e51b7Smrg 105fe5e51b7Smrgcommit 707d3adbc7d9ee918d6c70083f51ad851ce68852 106fe5e51b7SmrgMerge: 741c50c... 489e007... 107fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 108fe5e51b7SmrgDate: Mon Aug 20 15:20:39 2007 -0700 109fe5e51b7Smrg 110fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 111fe5e51b7Smrg 112fe5e51b7Smrgcommit 489e007a29de63716ab550eacb3e98a91975d1d5 113fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 114fe5e51b7SmrgDate: Wed Aug 8 21:32:57 2007 +0200 115fe5e51b7Smrg 116fe5e51b7Smrg Fixed major blending and compositing breakage. 117fe5e51b7Smrg 118fe5e51b7Smrg Do not adjust the destination blend factor if we need source alpha 119fe5e51b7Smrg but our source doesn't have an alpha channel. This makes no sense at all, 120fe5e51b7Smrg because the intermediate picture will always have alpha bits (either from 121fe5e51b7Smrg the original source, or forced to 0xff). 122fe5e51b7Smrg 123fe5e51b7Smrgcommit 3820f55e3068163f8c3047a25126673e6de2d16e 124fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 125fe5e51b7SmrgDate: Wed Aug 1 09:02:21 2007 -0700 126fe5e51b7Smrg 127fe5e51b7Smrg Add info for offset 116 in PInS version 5. 128fe5e51b7Smrg 129fe5e51b7Smrgcommit 7d7626f8429e108dd326899d927de4b4c79f71f5 130fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 131fe5e51b7SmrgDate: Mon Jul 30 12:36:19 2007 +0200 132fe5e51b7Smrg 133fe5e51b7Smrg Bug #4249: Further increase the minimum dot clock. 134fe5e51b7Smrg 135fe5e51b7Smrgcommit 1a1fe837bc114b5f741e87f14bef74803e299c8d 136fe5e51b7SmrgAuthor: Brice Goglin <Brice.Goglin@ens-lyon.org> 137fe5e51b7SmrgDate: Fri Jul 27 18:19:21 2007 +0200 138fe5e51b7Smrg 139fe5e51b7Smrg Change minimal frequency guess from 12 to 16MHz 140fe5e51b7Smrg 141fe5e51b7Smrg G550 seems to lock up with frequencies below 16MHz. 142fe5e51b7Smrg 143fe5e51b7Smrg Reported by Benjamin Wong <hackerb9@u.washington.edu> in 144fe5e51b7Smrg http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430112 145fe5e51b7Smrg and https://bugs.freedesktop.org/show_bug.cgi?id=11339 146fe5e51b7Smrg 147fe5e51b7Smrgcommit 041caa230b91a017881394c59d76d663d647529c 148fe5e51b7SmrgAuthor: Gabriele Gorla <gorlik@yahoo.com> 149fe5e51b7SmrgDate: Thu Jul 19 22:14:51 2007 -0400 150fe5e51b7Smrg 151fe5e51b7Smrg Add Xv support for Millennium II chips 152fe5e51b7Smrg 153fe5e51b7Smrg Bug 11537 154fe5e51b7Smrg 155fe5e51b7Smrgcommit 7b080d993ceda7b181e0611ed0c997c8aecc9ad7 156fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 157fe5e51b7SmrgDate: Sun Apr 15 12:47:27 2007 +0200 158fe5e51b7Smrg 159fe5e51b7Smrg Added memcpy-based DownloadFromScreen implementation. 160fe5e51b7Smrg 161fe5e51b7Smrgcommit 43b79af51b600e98ecac9d57aeb0d686dbc6a50e 162fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 163fe5e51b7SmrgDate: Sun Apr 15 12:41:01 2007 +0200 164fe5e51b7Smrg 165fe5e51b7Smrg On G550, do A8 adds in hardware. 166fe5e51b7Smrg 167fe5e51b7Smrgcommit 69c4ed205afbeb9ad937f079caace6cee19bd7b1 168fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 169fe5e51b7SmrgDate: Sun Apr 15 12:28:28 2007 +0200 170fe5e51b7Smrg 171fe5e51b7Smrg Make DRI initialization work when using EXA. 172fe5e51b7Smrg 173fe5e51b7Smrg Still need to implement InitBuffers and MoveBuffers for EXA. 174fe5e51b7Smrg 175fe5e51b7Smrgcommit 920b84364a374ac8cde9314efc6742c11a72ce4f 176fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 177fe5e51b7SmrgDate: Fri Mar 30 20:47:14 2007 +0200 178fe5e51b7Smrg 179fe5e51b7Smrg Removed the debug messages for solid and copy ops. 180fe5e51b7Smrg 181fe5e51b7Smrgcommit d1696d91d9da79c40b0576b3ce754dc8a6666117 182fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 183fe5e51b7SmrgDate: Fri Mar 30 20:45:45 2007 +0200 184fe5e51b7Smrg 185fe5e51b7Smrg Sync after UploadToScreen. 186fe5e51b7Smrg 187fe5e51b7Smrgcommit 1246f724bfdd44b49091516bf909ecf97c9b82db 188fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 189fe5e51b7SmrgDate: Wed Mar 28 11:14:24 2007 -0400 190fe5e51b7Smrg 191fe5e51b7Smrg Default mode on G200SE of 1024x768 @ 16bpp. 192fe5e51b7Smrg 193fe5e51b7Smrg The poor thing has so little VRAM that you can't do any bigger than 640x480 194fe5e51b7Smrg at 32bpp, so in the interest of having a reasonable screen size... 195fe5e51b7Smrg 196fe5e51b7Smrgcommit 834bdfc2503f64d8f3bff088dc5eaf8f52f828f5 197fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 198fe5e51b7SmrgDate: Wed Mar 28 11:09:56 2007 -0400 199fe5e51b7Smrg 200fe5e51b7Smrg Disable MTRR support for PCIE G200SE cards, as it tickles hardware bugs. 201fe5e51b7Smrg 202fe5e51b7Smrgcommit 630390dc5b892941ed6609ca5c35b90be53333f7 203fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 204fe5e51b7SmrgDate: Wed Mar 28 11:07:49 2007 -0400 205fe5e51b7Smrg 206fe5e51b7Smrg Fix various timing bugs on the G200SE. 207fe5e51b7Smrg 208fe5e51b7Smrgcommit 99430f1cf36c07350cdc557dbbb5c0a34c9b9dd0 209fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 210fe5e51b7SmrgDate: Sun Mar 18 12:41:06 2007 +0100 211fe5e51b7Smrg 212fe5e51b7Smrg Shut up the compiler. 213fe5e51b7Smrg 214fe5e51b7Smrgcommit 741c50c162986a14647301c2c5f8e080a7664efd 215fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 216fe5e51b7SmrgDate: Fri Feb 2 15:50:14 2007 -0800 217fe5e51b7Smrg 218fe5e51b7Smrg Code refactoring in MGAScreenInit. 219fe5e51b7Smrg 220fe5e51b7Smrg Rearrange code so that functions that are selected based on MergedFB 221fe5e51b7Smrg and SecondCrtc are selected in one place instead of 3. Rearrange some 222fe5e51b7Smrg code that selects on FBDev and Primary to flow a little better. 223fe5e51b7Smrg 224fe5e51b7Smrgcommit 4432091b2597cf4bba09009622d247c0d8ff151f 225fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 226fe5e51b7SmrgDate: Thu Feb 1 13:45:18 2007 -0800 227fe5e51b7Smrg 228fe5e51b7Smrg Ensure the result of MGAMapMem is checked. 229fe5e51b7Smrg 230fe5e51b7Smrg Add GCC warn_unused_result attribute to MGAMapMem. Add a check of the 231fe5e51b7Smrg return value to one place that was missing it (in MGACountRam), and 232fe5e51b7Smrg check the return of that function. 233fe5e51b7Smrg 234fe5e51b7Smrgcommit 3a47132af4dfab420e3c35d7d100dd93fb7bf9c6 235fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 236fe5e51b7SmrgDate: Thu Feb 1 13:30:34 2007 -0800 237fe5e51b7Smrg 238fe5e51b7Smrg Refactor memory map / unmap functions. 239fe5e51b7Smrg 240fe5e51b7Smrg MGAMapMem and MGAMapMemFBDev were refactored into a single function. 241fe5e51b7Smrg This happens to fix a bug triggered in software XAA paths because 242fe5e51b7Smrg MGAMapMem did not set FbStart. MGAUnmapMem and MGAUnmapMemFBDev were 243fe5e51b7Smrg also refactored into a single function. 244fe5e51b7Smrg 245fe5e51b7Smrgcommit 916d41bcf99bbf666bf634edb1c72b90d9b16ea0 246fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 247fe5e51b7SmrgDate: Mon Jan 15 11:42:52 2007 -0800 248fe5e51b7Smrg 249fe5e51b7Smrg Convert to new pci_device_cfg_write_u* interface. 250fe5e51b7Smrg 251fe5e51b7Smrgcommit b26bfefb7ea107be3949daea0f6beca6d80c09d4 252fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 253fe5e51b7SmrgDate: Mon Jan 15 11:42:07 2007 -0800 254fe5e51b7Smrg 255fe5e51b7Smrg Pass the correct pointer to pci_device_cfg_write_bits. 256fe5e51b7Smrg 257fe5e51b7Smrgcommit d5b4dbe749e860e4349607c57467f8085dc28c33 258fe5e51b7SmrgMerge: cb103a1... 876657e... 259fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 260fe5e51b7SmrgDate: Tue Jan 9 16:04:06 2007 -0800 261fe5e51b7Smrg 262fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 263fe5e51b7Smrg 264fe5e51b7Smrgcommit 876657e613de6d9dd906c95e05fc590a84d1c322 265fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 266fe5e51b7SmrgDate: Tue Dec 26 22:14:57 2006 +0100 267fe5e51b7Smrg 268fe5e51b7Smrg Fixed a typo that caused MGAREG_C2OFFSET to be set to a bad value. 269fe5e51b7Smrg 270fe5e51b7Smrg Unfortunately, this doesn't fix any bugs because afterwards, 271fe5e51b7Smrg the correct value would be stored in MGAREG_C2OFFSET anyway. 272fe5e51b7Smrg 273fe5e51b7Smrgcommit 7d676a830a9b0c5593e144e15a14dc4aa6bc5ab7 274fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 275fe5e51b7SmrgDate: Tue Dec 26 19:45:18 2006 +0100 276fe5e51b7Smrg 277fe5e51b7Smrg More boring janitoring work. 278fe5e51b7Smrg 279fe5e51b7Smrgcommit 787284f420d324821ac31b43f3d915d58533a141 280fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 281fe5e51b7SmrgDate: Tue Dec 26 00:30:51 2006 +0100 282fe5e51b7Smrg 283fe5e51b7Smrg Fixed a typo in a debug message. 284fe5e51b7Smrg 285fe5e51b7Smrgcommit 373bf108414cebdaea8d3febc9120566ef5e4118 286fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 287fe5e51b7SmrgDate: Tue Dec 26 00:28:55 2006 +0100 288fe5e51b7Smrg 289fe5e51b7Smrg Bug #9448: Actually write the C2STARTADD0 register. 290fe5e51b7Smrg 291fe5e51b7Smrgcommit fd91b601ec4dd48cfb6ea5495b595fec6d932ab5 292fe5e51b7SmrgMerge: f84b138... 0ce8f52... 293fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 294fe5e51b7SmrgDate: Sun Dec 24 06:32:53 2006 +0200 295fe5e51b7Smrg 296fe5e51b7Smrg Merge branch 'temp' 297fe5e51b7Smrg 298fe5e51b7Smrgcommit 0ce8f522a207dd0fa21ebf41b82f6af930cd7e54 299fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 300fe5e51b7SmrgDate: Sun Dec 24 06:24:56 2006 +0200 301fe5e51b7Smrg 302fe5e51b7Smrg bump to 1.4.6.1 (respin) 303fe5e51b7Smrg No code changes, just built with a better util-macros. 304fe5e51b7Smrg 305fe5e51b7Smrgcommit 74d21b74774c81d3d96ff3017763c25e3660dde0 306fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 307fe5e51b7SmrgDate: Sun Dec 24 06:23:43 2006 +0200 308fe5e51b7Smrg 309fe5e51b7Smrg bump to 1.4.6 310fe5e51b7Smrg 311fe5e51b7Smrgcommit f84b13871114e6bb486402e00186a319df123f53 312fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 313fe5e51b7SmrgDate: Sun Dec 24 06:23:19 2006 +0200 314fe5e51b7Smrg 315fe5e51b7Smrg bump to 1.4.6.1 316fe5e51b7Smrg 317fe5e51b7Smrgcommit 9b2e1381ccda8bb4f4d186c20d5672738adfc04b 318fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 319fe5e51b7SmrgDate: Sat Dec 16 01:44:49 2006 +0200 320fe5e51b7Smrg 321fe5e51b7Smrg bump to 1.4.6 322fe5e51b7Smrg 323fe5e51b7Smrgcommit cb103a18067adb3256c0b791255ce8435ff57e06 324fe5e51b7SmrgMerge: d0e0362... 4bcfca9... 325fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 326fe5e51b7SmrgDate: Mon Dec 11 15:06:19 2006 -0800 327fe5e51b7Smrg 328fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 329fe5e51b7Smrg 330fe5e51b7Smrgcommit d0e03622811fd94c830c0b5233ff505392c0d331 331fe5e51b7SmrgMerge: 8fee907... 1dd6e69... 332fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 333fe5e51b7SmrgDate: Mon Dec 11 15:06:03 2006 -0800 334fe5e51b7Smrg 335fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 336fe5e51b7Smrg 337fe5e51b7Smrg Conflicts: 338fe5e51b7Smrg 339fe5e51b7Smrg src/mga_macros.h 340fe5e51b7Smrg 341fe5e51b7Smrgcommit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412 342fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 343fe5e51b7SmrgDate: Sun Dec 10 14:33:10 2006 +0100 344fe5e51b7Smrg 345fe5e51b7Smrg Replaced some more magic values with register names. 346fe5e51b7Smrg 347fe5e51b7Smrgcommit 55d283a8c2347e809dadace3fb9a026bab6d57dd 348fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 349fe5e51b7SmrgDate: Wed Dec 6 18:46:00 2006 +0200 350fe5e51b7Smrg 351fe5e51b7Smrg Makefile.am: fix ChangeLog hook 352fe5e51b7Smrg Make ChangeLog hook safe for all situations I could think of, including 353fe5e51b7Smrg carrying the ChangeLog through for distcheck when objdir != srcdir. It's 354fe5e51b7Smrg significantly more ugly, but eh. 355fe5e51b7Smrg 356fe5e51b7Smrgcommit fbbbb853041ae4af36eeffb24188b9a5513ba7d5 357fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 358fe5e51b7SmrgDate: Sat Dec 2 12:42:34 2006 +0100 359fe5e51b7Smrg 360fe5e51b7Smrg Removed a duplicated register definition. 361fe5e51b7Smrg 362fe5e51b7Smrgcommit 447aae84d07cab34987ab08ead9319e176ccd904 363fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 364fe5e51b7SmrgDate: Fri Dec 1 20:19:13 2006 +0100 365fe5e51b7Smrg 366fe5e51b7Smrg More janitoring work. 367fe5e51b7Smrg 368fe5e51b7Smrg Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions 369fe5e51b7Smrg to mga_reg.h. 370fe5e51b7Smrg Cleaned up the DAC2 routing. 371fe5e51b7Smrg 372fe5e51b7Smrgcommit 10b2202c254b71b8d0da987a225d5e78a030bca4 373fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 374fe5e51b7SmrgDate: Fri Dec 1 19:10:55 2006 +0100 375fe5e51b7Smrg 376fe5e51b7Smrg Use the XORG_RELEASE_VERSION autoconf macro. 377fe5e51b7Smrg 378fe5e51b7Smrgcommit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a 379fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 380fe5e51b7SmrgDate: Thu Nov 30 19:59:38 2006 +0200 381fe5e51b7Smrg 382fe5e51b7Smrg bump to 1.4.5 383fe5e51b7Smrg 384fe5e51b7Smrgcommit 5bbafd77678a2b0f82e820aa98337a014d284554 385fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 386fe5e51b7SmrgDate: Sun Nov 26 18:06:12 2006 +0100 387fe5e51b7Smrg 388fe5e51b7Smrg Made some XAA function static. 389fe5e51b7Smrg 390fe5e51b7Smrgcommit 4778901bb13a950285c55ea6f058e94ee7b03652 391fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 392fe5e51b7SmrgDate: Sun Nov 26 16:21:34 2006 +0100 393fe5e51b7Smrg 394fe5e51b7Smrg Removed a duplicated register definition. 395fe5e51b7Smrg 396fe5e51b7Smrgcommit f9d83ad601c8cba197e96f0b907f1dae6134953b 397fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 398fe5e51b7SmrgDate: Sun Nov 26 16:17:12 2006 +0100 399fe5e51b7Smrg 400fe5e51b7Smrg Replaced more magic values with register names. 401fe5e51b7Smrg 402fe5e51b7Smrgcommit 6df85941ce077e1eee8b43945c51ab1b0906c758 403fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 404fe5e51b7SmrgDate: Sun Nov 26 15:39:54 2006 +0100 405fe5e51b7Smrg 406fe5e51b7Smrg Use register names in MGASaveScreenMerged() rather than magic numbers. 407fe5e51b7Smrg 408fe5e51b7Smrgcommit b3ee69f6ac058e52d5175f611090baa76eed49f9 409fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 410fe5e51b7SmrgDate: Sun Nov 26 15:24:46 2006 +0100 411fe5e51b7Smrg 412fe5e51b7Smrg Register name tweak. 413fe5e51b7Smrg 414fe5e51b7Smrg The "DAC power down" register powers down the DAC when it's 415fe5e51b7Smrg set to zero, and enables it when it's set to one. 416fe5e51b7Smrg To avoid confusion, I renamed it. 417fe5e51b7Smrg 418fe5e51b7Smrgcommit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528 419fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 420fe5e51b7SmrgDate: Sat Nov 25 17:08:15 2006 +0100 421fe5e51b7Smrg 422fe5e51b7Smrg Removed some unused defines from mga_reg.h. 423fe5e51b7Smrg 424fe5e51b7Smrgcommit 334c7237078652722d7dec1c74812af46bfd7c67 425fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 426fe5e51b7SmrgDate: Sat Nov 25 16:42:49 2006 +0100 427fe5e51b7Smrg 428fe5e51b7Smrg Removed some duplicated register definitions. 429fe5e51b7Smrg 430fe5e51b7Smrgcommit be88d58968c604624617f40820dc9a50a92661be 431fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 432fe5e51b7SmrgDate: Sun Nov 19 21:04:01 2006 +0100 433fe5e51b7Smrg 434fe5e51b7Smrg Bug #2168: Fix graphics corruptions with Mystique rev 2. 435fe5e51b7Smrg 436fe5e51b7Smrgcommit daeecb63567fb394654c9e66d64c3c53658f2c7d 437fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 438fe5e51b7SmrgDate: Fri Nov 17 23:08:25 2006 +0100 439fe5e51b7Smrg 440fe5e51b7Smrg Enabled the Exa composite hooks on G550. 441fe5e51b7Smrg 442fe5e51b7Smrgcommit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a 443fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org> 444fe5e51b7SmrgDate: Mon Nov 6 23:58:06 2006 -0500 445fe5e51b7Smrg 446fe5e51b7Smrg Minor typofix that was causing configure to exit with a syntax error 447fe5e51b7Smrg 448fe5e51b7Smrgcommit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d 449fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 450fe5e51b7SmrgDate: Fri Oct 27 11:53:40 2006 -0700 451fe5e51b7Smrg 452fe5e51b7Smrg Bump version to 1.4.4. 453fe5e51b7Smrg 454fe5e51b7Smrgcommit 19d950e61b2b33052e52c33add8e70c29ac9d766 455fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 456fe5e51b7SmrgDate: Fri Oct 27 11:48:35 2006 -0700 457fe5e51b7Smrg 458fe5e51b7Smrg Convert tests of pMga->Chipset to tests of single bit flags. 459fe5e51b7Smrg 460fe5e51b7Smrg Several places in the driver contain if-statements that test Chipset against 461fe5e51b7Smrg several different values to determine what functionality to use. Some of 462fe5e51b7Smrg these tests, HALCHIPSETS in particular, test as many as 6 different values. 463fe5e51b7Smrg This bloats the code size unnecessarilly. Instead we cache the results of 464fe5e51b7Smrg some of those tests in single bit flags stored in pMga. 465fe5e51b7Smrg 466fe5e51b7Smrg These changes are similar to some changes in the pci-rework branch. 467fe5e51b7Smrg 468fe5e51b7Smrgcommit d28c4a3307984b86e0f3cc68fa48cdc01e307a7c 469fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 470fe5e51b7SmrgDate: Thu Oct 26 19:52:54 2006 -0700 471fe5e51b7Smrg 472fe5e51b7Smrg Fix bug #8666. git-bisect for the win! 473fe5e51b7Smrg 474fe5e51b7Smrg Since && takes precedence over ||, put parenthesis around the || block to 475fe5e51b7Smrg make all the operations associate in the intended manner. 476fe5e51b7Smrg 477fe5e51b7Smrgcommit 041910d3b9f6284b4b8a7df10f284528a7e79d12 478fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 479fe5e51b7SmrgDate: Fri Oct 13 18:33:39 2006 -0400 480fe5e51b7Smrg 481fe5e51b7Smrg Bump to 1.4.3 482fe5e51b7Smrg 483fe5e51b7Smrgcommit 8fee907cac7e5924630e3648bfb72ad9bd021ea8 484fe5e51b7SmrgMerge: 7cecee1... 2fc0ebf... 485fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 486fe5e51b7SmrgDate: Tue Oct 10 11:43:52 2006 -0700 487fe5e51b7Smrg 488fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 489fe5e51b7Smrg 490fe5e51b7Smrgcommit 2fc0ebfbe850c138e840b6653ed1476623aa04a4 491fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 492fe5e51b7SmrgDate: Thu Sep 28 18:39:20 2006 +0200 493fe5e51b7Smrg 494fe5e51b7Smrg Make the DUALSTAGE0 code slightly easier to read. 495fe5e51b7Smrg 496fe5e51b7Smrgcommit ddd93ae96c5427d4c8d03eb225b66a1a93fa2bc8 497fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org> 498fe5e51b7SmrgDate: Wed Sep 20 20:42:12 2006 -0400 499fe5e51b7Smrg 500fe5e51b7Smrg Minor manpage typofixes. Patch by A. Costa (see Debian bug #364558) 501fe5e51b7Smrg 502fe5e51b7Smrgcommit 34ec93796e4be31d95d1ed507660c65a2c60fa43 503fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 504fe5e51b7SmrgDate: Wed Sep 20 21:05:16 2006 +0200 505fe5e51b7Smrg 506fe5e51b7Smrg Unbreak the build: MGAStormSync() is required by mga_dga.c. 507fe5e51b7Smrg 508fe5e51b7Smrgcommit 954c8d06f2697d4f764583dd3336b4cc266b90fd 509fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 510fe5e51b7SmrgDate: Wed Sep 20 20:51:36 2006 +0200 511fe5e51b7Smrg 512fe5e51b7Smrg Removed the XAA atype tables. 513fe5e51b7Smrg 514fe5e51b7Smrg Added a FIXME on BLK support for GXcopy instead. 515fe5e51b7Smrg 516fe5e51b7Smrgcommit ecc155e27b6566196e56de241ae81266e03dc90e 517fe5e51b7SmrgMerge: e7b36c6... 2e73c29... 518fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 519fe5e51b7SmrgDate: Wed Sep 20 20:43:55 2006 +0200 520fe5e51b7Smrg 521fe5e51b7Smrg Merge branch 'exa' 522fe5e51b7Smrg 523fe5e51b7Smrgcommit 2e73c2989e6cf0f24f8b0c4ae372f0c44dc19755 524fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 525fe5e51b7SmrgDate: Wed Sep 20 20:41:18 2006 +0200 526fe5e51b7Smrg 527fe5e51b7Smrg Documented the AccelMethod option (copied from Radeon's man page). 528fe5e51b7Smrg 529fe5e51b7Smrgcommit 3f4c12a388af05995273c9abe742f82f84e558a8 530fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 531fe5e51b7SmrgDate: Wed Sep 20 20:36:18 2006 +0200 532fe5e51b7Smrg 533fe5e51b7Smrg Removed the DFS stub. 534fe5e51b7Smrg 535fe5e51b7Smrgcommit 69cc0060d9516d5fba5fa46607a993f3ebfd5d89 536fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 537fe5e51b7SmrgDate: Wed Sep 20 20:26:37 2006 +0200 538fe5e51b7Smrg 539fe5e51b7Smrg Fall back to software rendering for A8 add A8. 540fe5e51b7Smrg 541fe5e51b7Smrgcommit e7b36c66852077ffbbffdd20e39ed4b6f24541b7 542fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 543fe5e51b7SmrgDate: Mon Sep 18 11:08:51 2006 -0700 544fe5e51b7Smrg 545fe5e51b7Smrg Bump version to 1.4.2. Bump required server version to 1.1.0 (X.org 7.1) 546fe5e51b7Smrg from pre-1.1.0 version. 547fe5e51b7Smrg 548fe5e51b7Smrgcommit 5830edf81a0c0119bd2486b48e56fdb9daf72586 549fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 550fe5e51b7SmrgDate: Sat Sep 16 23:59:32 2006 +0200 551fe5e51b7Smrg 552fe5e51b7Smrg Generate ChangeLog from git. 553fe5e51b7Smrg 554fe5e51b7Smrgcommit 3b2a7b1faf142d4301c55b8951657e177b5ac118 555fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 556fe5e51b7SmrgDate: Sat Sep 16 23:06:36 2006 +0200 557fe5e51b7Smrg 558fe5e51b7Smrg Don't install stormdwg. 559fe5e51b7Smrg 560fe5e51b7Smrgcommit 3d7c109c4864f021590c3bcf0f09685498225dde 561fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 562fe5e51b7SmrgDate: Sat Sep 16 22:31:02 2006 +0200 563fe5e51b7Smrg 564fe5e51b7Smrg Enable the BYPASS332 and NODITHER flags when writing to 8 bpp dests. 565fe5e51b7Smrg 566fe5e51b7Smrg Thanks to Ville Syrjälä, who noticed these were missing. 567fe5e51b7Smrg Note that this messes up glyph compositing (A8 add A8) pretty much, but 568fe5e51b7Smrg I don't know what's really going on there yet. 569fe5e51b7Smrg 570fe5e51b7Smrgcommit 2eae7c98fcd3f452f9b9c2eef4a9cf820edf69aa 571fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 572fe5e51b7SmrgDate: Fri Sep 15 16:01:28 2006 +0200 573fe5e51b7Smrg 574fe5e51b7Smrg More DUALSTAGE0 fixes related to A8 writes. 575fe5e51b7Smrg 576fe5e51b7Smrg When writing from a texture without an alpha channel to an A8 texture, 577fe5e51b7Smrg we now set the alpha channel to 0xff via FCOL. 578fe5e51b7Smrg 579fe5e51b7Smrgcommit b1031689212bfbbe832dd73337ea8cd5d66ae2ff 580fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 581fe5e51b7SmrgDate: Fri Sep 15 13:43:55 2006 +0200 582fe5e51b7Smrg 583fe5e51b7Smrg Reworked DUALSTAGE0 setup. 584fe5e51b7Smrg 585fe5e51b7Smrg If we're copying from A8 to A8, we need to replicate the alpha to 586fe5e51b7Smrg the color channels. 587fe5e51b7Smrg 588fe5e51b7Smrgcommit 965faa3661f73a1d4cbf6368458244dff45a76ad 589fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 590fe5e51b7SmrgDate: Wed Sep 13 14:56:29 2006 +0200 591fe5e51b7Smrg 592fe5e51b7Smrg Only use the source texture's alpha channel if it actually has one. 593fe5e51b7Smrg 594fe5e51b7Smrgcommit 14202e7c47326e8678bf38a6bda63d608f1f152b 595fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 596fe5e51b7SmrgDate: Mon Sep 11 14:22:24 2006 +0200 597fe5e51b7Smrg 598fe5e51b7Smrg Support masks without alpha. 599fe5e51b7Smrg 600fe5e51b7Smrgcommit 35651deb8fc3b8b7b0cf4895732f2edeecdabeb7 601fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 602fe5e51b7SmrgDate: Sun Sep 10 00:56:10 2006 +0200 603fe5e51b7Smrg 604fe5e51b7Smrg Fixed the remaining MGAAllocateMemory() issues. 605fe5e51b7Smrg 606fe5e51b7Smrgcommit d5e9270acf2f914fe7603225ac605cd29830bed6 607fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 608fe5e51b7SmrgDate: Sun Sep 10 00:04:48 2006 +0200 609fe5e51b7Smrg 610fe5e51b7Smrg Fixed the engine sync needed for TexturedVideo. 611fe5e51b7Smrg 612fe5e51b7Smrgcommit 7739a929100d516e06646a38062df8da1f33f774 613fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 614fe5e51b7SmrgDate: Sun Sep 10 00:04:21 2006 +0200 615fe5e51b7Smrg 616fe5e51b7Smrg The XAA path in MGA_SYNC() now only syncs the engine if NeedToSync is set. 617fe5e51b7Smrg 618fe5e51b7Smrg This makes both paths behave the same way. 619fe5e51b7Smrg 620fe5e51b7Smrgcommit 1a045b37db4c7c606ed056addf52d337dbdeb88d 621fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 622fe5e51b7SmrgDate: Sat Sep 9 23:58:42 2006 +0200 623fe5e51b7Smrg 624fe5e51b7Smrg Dont't multiply the retval of MGAAllocateMemory() by cpp again. 625fe5e51b7Smrg 626fe5e51b7Smrgcommit dfa5807c1f5694728aa92138eb0eab5bd5b8c3d7 627fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 628fe5e51b7SmrgDate: Sat Sep 9 13:24:01 2006 +0200 629fe5e51b7Smrg 630fe5e51b7Smrg Make use of MGA_MARK_SYNC. 631fe5e51b7Smrg 632fe5e51b7Smrgcommit bfb329542377e8e8141c87ed30389de6d7180e06 633fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 634fe5e51b7SmrgDate: Sat Sep 9 13:20:13 2006 +0200 635fe5e51b7Smrg 636fe5e51b7Smrg XV works with EXA now (dumb port of the Radeon code). 637fe5e51b7Smrg 638fe5e51b7Smrgcommit 9fa71aef67df48b59f9d70fddd2725f739d171a9 639fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 640fe5e51b7SmrgDate: Sat Sep 9 11:58:32 2006 +0200 641fe5e51b7Smrg 642fe5e51b7Smrg Do A8->A8 ops in hardware. 643fe5e51b7Smrg 644fe5e51b7Smrgcommit 7a7feb251b8172786755ab81b154bbfb7d193dbc 645fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 646fe5e51b7SmrgDate: Sat Sep 9 01:16:26 2006 +0200 647fe5e51b7Smrg 648fe5e51b7Smrg PrepareSourceTexture() cannot fail. 649fe5e51b7Smrg 650fe5e51b7Smrgcommit c2545d6e94964fc981746cdf212b5dc9cd4fdd1b 651fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 652fe5e51b7SmrgDate: Sat Sep 9 01:14:38 2006 +0200 653fe5e51b7Smrg 654fe5e51b7Smrg Implemented pseudo-DMA based UTS. 655fe5e51b7Smrg 656fe5e51b7Smrgcommit 3969fe1176da9e39b722982889a3cccc0f812e59 657fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 658fe5e51b7SmrgDate: Thu Sep 7 22:52:26 2006 +0200 659fe5e51b7Smrg 660fe5e51b7Smrg Refactored that texture format lookup code into mgaGetTexFormat(). 661fe5e51b7Smrg 662fe5e51b7Smrgcommit ad57c370ba8ffcbf0b7cf404c61ed01bc924ddd5 663fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 664fe5e51b7SmrgDate: Thu Sep 7 22:21:19 2006 +0200 665fe5e51b7Smrg 666fe5e51b7Smrg Use the right dithering mode for r5g5b5 textures. 667fe5e51b7Smrg 668fe5e51b7Smrg This makes all of rendercheck's blend tests work. 669fe5e51b7Smrg 670fe5e51b7Smrgcommit c39749d6e0e967cd12bcc629c3840905e07dd60c 671fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 672fe5e51b7SmrgDate: Thu Sep 7 18:24:08 2006 +0200 673fe5e51b7Smrg 674fe5e51b7Smrg Enable composite hooks on G400/G450 only. 675fe5e51b7Smrg 676fe5e51b7Smrg The PCI-IDs aren't ordered, so using ">=" there was totally broken. 677fe5e51b7Smrg I don't know whether the code works on G550 either, so I'm not enabling 678fe5e51b7Smrg it on these cards yet. 679fe5e51b7Smrg 680fe5e51b7Smrgcommit 0ee922bb4cce012c980c5d6178fe04e86c5cce53 681fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 682fe5e51b7SmrgDate: Thu Sep 7 17:36:23 2006 +0200 683fe5e51b7Smrg 684fe5e51b7Smrg Code cleanup/formatting fixes. 685fe5e51b7Smrg 686fe5e51b7Smrgcommit 4ed932caa27df8c6a4c58478d3f9b45815de06f5 687fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 688fe5e51b7SmrgDate: Thu Sep 7 17:21:52 2006 +0200 689fe5e51b7Smrg 690fe5e51b7Smrg Moved some FIXMEs. 691fe5e51b7Smrg 692fe5e51b7Smrgcommit 3b06475096238b3adc3151f27a92d7a8dbbb0231 693fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 694fe5e51b7SmrgDate: Thu Sep 7 17:16:35 2006 +0200 695fe5e51b7Smrg 696fe5e51b7Smrg Put my name in mga_exa.c 697fe5e51b7Smrg 698fe5e51b7Smrgcommit 6391a058b333de306c9b11c6a723cb4457e76c8f 699fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 700fe5e51b7SmrgDate: Wed Sep 6 16:43:51 2006 +0200 701fe5e51b7Smrg 702fe5e51b7Smrg Fixed the non-EXA build. 703fe5e51b7Smrg 704fe5e51b7Smrgcommit 74e85b19e564927337f23f6de25bb58f309e892b 705fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 706fe5e51b7SmrgDate: Wed Sep 6 15:38:39 2006 +0200 707fe5e51b7Smrg 708fe5e51b7Smrg Enabled alpha filtering. 709fe5e51b7Smrg 710fe5e51b7Smrg This doesn't influence rendercheck's test outcome, but helps with 711fe5e51b7Smrg evas_xrender_x11_test. 712fe5e51b7Smrg 713fe5e51b7Smrgcommit c2490640b4b237239872c5acbde3704e6e1412e9 714fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 715fe5e51b7SmrgDate: Wed Sep 6 14:36:38 2006 +0200 716fe5e51b7Smrg 717fe5e51b7Smrg Code cleanup/formatting fixes. 718fe5e51b7Smrg 719fe5e51b7Smrgcommit 646a9927b8412b0224e260be46162782e87bf7c4 720fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 721fe5e51b7SmrgDate: Wed Sep 6 14:24:26 2006 +0200 722fe5e51b7Smrg 723fe5e51b7Smrg Don't set TAMASK in TEXCTL. 724fe5e51b7Smrg 725fe5e51b7Smrg According to the specs this disables alpha transparency, which we 726fe5e51b7Smrg probably don't want, but the tests say it's good. 727fe5e51b7Smrg 728fe5e51b7Smrgcommit e7eccaba96e5bc4ff3ddde49b5245cd448bd5d9b 729fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 730fe5e51b7SmrgDate: Wed Sep 6 11:48:16 2006 +0200 731fe5e51b7Smrg 732fe5e51b7Smrg Rendering to (A)BGR isn't supported. 733fe5e51b7Smrg 734fe5e51b7Smrgcommit 72338321331fe8830d1d95a1c7f4a4fb5f2d9b0a 735fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 736fe5e51b7SmrgDate: Wed Sep 6 10:57:13 2006 +0200 737fe5e51b7Smrg 738fe5e51b7Smrg Disabled color keying. 739fe5e51b7Smrg 740fe5e51b7Smrgcommit 056915493981be3f3b9270334e0f992a290dfab6 741fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 742fe5e51b7SmrgDate: Mon Aug 28 22:19:23 2006 +0200 743fe5e51b7Smrg 744fe5e51b7Smrg Make this code a little more readable. 745fe5e51b7Smrg 746fe5e51b7Smrgcommit b8320d198abe0cd26b2f76b9add634ef8245ba27 747fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 748fe5e51b7SmrgDate: Sun Aug 27 16:22:50 2006 +0200 749fe5e51b7Smrg 750fe5e51b7Smrg Minor code cleanup. 751fe5e51b7Smrg 752fe5e51b7Smrgcommit c525a7e73ac2ef18933d170f8497351d62e5b1ce 753fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 754fe5e51b7SmrgDate: Sun Aug 27 15:22:58 2006 +0200 755fe5e51b7Smrg 756fe5e51b7Smrg Fixed a typo. 757fe5e51b7Smrg 758fe5e51b7Smrgcommit e0f76b32992274faa0adb39dfd6df0fc3b434e96 759fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 760fe5e51b7SmrgDate: Sun Aug 27 12:44:16 2006 +0200 761fe5e51b7Smrg 762fe5e51b7Smrg Documented the mgaBlendOp array. 763fe5e51b7Smrg 764fe5e51b7Smrgcommit 5982e8200270d25a57da8ab0d1a8290cfaec070c 765fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 766fe5e51b7SmrgDate: Sun Aug 27 12:27:59 2006 +0200 767fe5e51b7Smrg 768fe5e51b7Smrg Cleaned up the XAA code a bit. 769fe5e51b7Smrg 770fe5e51b7Smrgcommit e7ba7c993f4e439672810ec9ce3a24df823051a4 771fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 772fe5e51b7SmrgDate: Sat Aug 26 22:33:25 2006 +0200 773fe5e51b7Smrg 774fe5e51b7Smrg Enable composite hooks on G400 or greater. 775fe5e51b7Smrg 776fe5e51b7Smrgcommit 6c365757891c3e0e0a55c7bea995ef8a4fb3f69c 777fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 778fe5e51b7SmrgDate: Sat Aug 26 22:32:25 2006 +0200 779fe5e51b7Smrg 780fe5e51b7Smrg Added missing mgaSetup() call to the PrepareComposite hook. 781fe5e51b7Smrg 782fe5e51b7Smrgcommit 2efbc687fcc0d05dca241e4079d9236d9cce0dde 783fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 784fe5e51b7SmrgDate: Sat Aug 26 22:27:34 2006 +0200 785fe5e51b7Smrg 786fe5e51b7Smrg Added a couple of missing newlines. 787fe5e51b7Smrg 788fe5e51b7Smrgcommit 17153c794d532f27a4248c3f64eba95ede62be87 789fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 790fe5e51b7SmrgDate: Sat Aug 26 21:42:41 2006 +0200 791fe5e51b7Smrg 792fe5e51b7Smrg The texture mapping opcode is 6, not 5. 793fe5e51b7Smrg 794fe5e51b7Smrgcommit 13f649c65784192c30c18581d8795f3c47060644 795fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 796fe5e51b7SmrgDate: Sat Aug 26 20:03:36 2006 +0200 797fe5e51b7Smrg 798fe5e51b7Smrg Removed ajax' comments on the Copy code, it seems to work well. 799fe5e51b7Smrg 800fe5e51b7Smrgcommit 4bf16b5f26266132f0c3e9c058df8014d52d56f1 801fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 802fe5e51b7SmrgDate: Sat Aug 26 18:04:08 2006 +0200 803fe5e51b7Smrg 804fe5e51b7Smrg Clean up color/planemask replicating. 805fe5e51b7Smrg 806fe5e51b7Smrgcommit 5d001aeb21aabde5b6cd919692de726ebaeb3481 807fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 808fe5e51b7SmrgDate: Sat Aug 26 18:00:49 2006 +0200 809fe5e51b7Smrg 810fe5e51b7Smrg Fixed alignment values (taken from kdrive). 811fe5e51b7Smrg 812fe5e51b7Smrgcommit 693f165e2c6c431e6c61c835781883c2bcef5876 813fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 814fe5e51b7SmrgDate: Fri Aug 25 22:40:17 2006 +0200 815fe5e51b7Smrg 816fe5e51b7Smrg Fixed corruption on copy, by copying kdrive's waitmarker code. 817fe5e51b7Smrg 818fe5e51b7Smrgcommit 7fbd85b3621f5368ebce178e5e55b0cbd5a80733 819fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 820fe5e51b7SmrgDate: Fri Aug 25 22:33:06 2006 +0200 821fe5e51b7Smrg 822fe5e51b7Smrg MGASelectBuffer() is only need for XAA. 823fe5e51b7Smrg 824fe5e51b7Smrgcommit 9b24934be499fe5de9fdc02a71e41906c50791d9 825fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 826fe5e51b7SmrgDate: Thu Aug 10 22:01:19 2006 +0200 827fe5e51b7Smrg 828fe5e51b7Smrg Switched the MACCESS code to the stuff from mga_storm.c. 829fe5e51b7Smrg 830fe5e51b7Smrgcommit 398447c041cffdc712a86f9fe9b58c3f5189c86e 831fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 832fe5e51b7SmrgDate: Thu Aug 10 21:31:49 2006 +0200 833fe5e51b7Smrg 834fe5e51b7Smrg Call exaMarkSync() where we'd set the NeedToSync flag for XAA. 835fe5e51b7Smrg 836fe5e51b7Smrgcommit b1126b4ab81c12f178fb7366a52b6f2d38af3810 837fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 838fe5e51b7SmrgDate: Thu Aug 10 21:25:48 2006 +0200 839fe5e51b7Smrg 840fe5e51b7Smrg Removed XAA specific code from MGAGetQuiescence. 841fe5e51b7Smrg 842fe5e51b7Smrgcommit 9141effdbbcd2b3419874ebb4e3898fca3474417 843fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 844fe5e51b7SmrgDate: Thu Aug 10 20:42:56 2006 +0200 845fe5e51b7Smrg 846fe5e51b7Smrg Added another chunk of kdrive code to mgaPrepareSolid(). 847fe5e51b7Smrg 848fe5e51b7Smrgcommit 3f440e499b5d0b073118855fe39fa4077971c06e 849fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 850fe5e51b7SmrgDate: Thu Aug 10 20:40:51 2006 +0200 851fe5e51b7Smrg 852fe5e51b7Smrg Added mgaSetup() from kdrive code. 853fe5e51b7Smrg 854fe5e51b7Smrgcommit 9285dec527a5f0ec21384b1e079a3878b622a6c2 855fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 856fe5e51b7SmrgDate: Thu Aug 10 20:03:18 2006 +0200 857fe5e51b7Smrg 858fe5e51b7Smrg Disable composite hooks for now, to reduce breakage. 859fe5e51b7Smrg 860fe5e51b7Smrgcommit db87a5ac8feca5f0126c7af4c51f69222fae7dd9 861fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 862fe5e51b7SmrgDate: Thu Aug 10 20:02:51 2006 +0200 863fe5e51b7Smrg 864fe5e51b7Smrg Wait until the DMA engine is idle in mgaWaitMarker. 865fe5e51b7Smrg 866fe5e51b7Smrgcommit 84ec0db961de3b10ac02ec5ae6adcec5cc439069 867fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 868fe5e51b7SmrgDate: Thu Aug 10 19:49:22 2006 +0200 869fe5e51b7Smrg 870fe5e51b7Smrg Initial commit of the Exa bits. 871fe5e51b7Smrg 872fe5e51b7Smrg Based on ajax' mga-exa-2.patch with some straight forward fixes 873fe5e51b7Smrg by myself. 874fe5e51b7Smrg 875fe5e51b7Smrgcommit 7cecee186c889902bed9b7fa042f0bd3cc0297ef 876fe5e51b7SmrgMerge: 160b1f7... bde5920... 877fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 878fe5e51b7SmrgDate: Thu Aug 10 10:19:55 2006 -0700 879fe5e51b7Smrg 880fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 881fe5e51b7Smrg 882fe5e51b7Smrgcommit bde592047cd62194d7ef67520a9fdbaf269a8b90 883fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 884fe5e51b7SmrgDate: Wed Aug 9 21:59:42 2006 +0200 885fe5e51b7Smrg 886fe5e51b7Smrg Bug #7265: Fix MGA DRI locking. 887fe5e51b7Smrg 888fe5e51b7Smrg The server expects the driver to take the DRI lock in the wakeup 889fe5e51b7Smrg handler, and release it in the block handler. 890fe5e51b7Smrg The old locking scheme didn't work like this, which caused problems. 891fe5e51b7Smrg We now no longer override wakeup/block handler and just use the ones 892fe5e51b7Smrg provided by the server. This means the DRI lock will be taken 893fe5e51b7Smrg "all the time" and not just when it's needed by the driver. 894fe5e51b7Smrg MGADRISwapContext* are activated again, so the wakeup handler could be 895fe5e51b7Smrg removed. 896fe5e51b7Smrg I didn't notice any DRI performance drop, but I didn't do serious 897fe5e51b7Smrg benchmarking either. 898fe5e51b7Smrg 899fe5e51b7Smrgcommit 160b1f79fab7266a24b7d1a680cdf29bad9707c1 900fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 901fe5e51b7SmrgDate: Tue Aug 8 16:59:15 2006 -0700 902fe5e51b7Smrg 903fe5e51b7Smrg Store the pci_device pointer passed into MGAPciProbe instead of 904fe5e51b7Smrg searching for it in MGAPreInit. 905fe5e51b7Smrg 906fe5e51b7Smrgcommit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68 907fe5e51b7SmrgMerge: 95e0722... 7170de8... 908fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 909fe5e51b7SmrgDate: Wed Jul 26 11:47:32 2006 -0700 910fe5e51b7Smrg 911fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 912fe5e51b7Smrg 913fe5e51b7Smrgcommit 95e0722ff2e8878cdd6bb0e349eecab042b879db 914fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 915fe5e51b7SmrgDate: Wed Jul 26 11:46:52 2006 -0700 916fe5e51b7Smrg 917fe5e51b7Smrg Current state of MGA driver modified to work with the xserver 918fe5e51b7Smrg pci-rework branch. 919fe5e51b7Smrg 920fe5e51b7Smrgcommit 7170de83762660efebff79be84f763008466ffa7 921fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 922fe5e51b7SmrgDate: Wed Jul 26 17:06:18 2006 +0200 923fe5e51b7Smrg 924fe5e51b7Smrg Merged the various .cvsignores into .gitignore 925fe5e51b7Smrg 926fe5e51b7Smrgcommit 80bf41170af91b62b9950a5cf7baf3c364a8f539 927fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 928fe5e51b7SmrgDate: Tue Jul 25 22:03:22 2006 +0200 929fe5e51b7Smrg 930fe5e51b7Smrg Fixed some warnings 931fe5e51b7Smrg 932fe5e51b7Smrgcommit 78c12368fa1c1985f41ce856ff453a967429870a 933fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 934fe5e51b7SmrgDate: Mon Jul 10 18:53:05 2006 -0700 935fe5e51b7Smrg 936fe5e51b7Smrg Add includes of <unistd.h> & <stdlib.h> to replace previously xf86wrapped prototypes 937fe5e51b7Smrg 938fe5e51b7Smrg Fixes these warnings: 939fe5e51b7Smrg make.out:"mga_dacG.c", line 195: warning: implicit function declaration: abs 940fe5e51b7Smrg make.out:"mga_dacG.c", line 1117: warning: implicit function declaration: usleepmake.out:"mga_driver.c", line 692: warning: implicit function declaration: usleep 941fe5e51b7Smrg 942fe5e51b7Smrgcommit c0dfac86e75ea63ae0c25c070bc661b6f41d35eb 943fe5e51b7SmrgAuthor: Peter Breitenlohner <peb@mppmu.mpg.de> 944fe5e51b7SmrgDate: Mon Jul 10 17:21:25 2006 -0700 945fe5e51b7Smrg 946fe5e51b7Smrg Bug #7369: mga(4) manpage typo mutilates part of text 947fe5e51b7Smrg 948fe5e51b7Smrg Bugzilla #7369: <https://bugs.freedesktop.org/show_bug.cgi?id=7369> 949fe5e51b7Smrg Patch #6079: <https://bugs.freedesktop.org/attachment.cgi?id=6079> 950fe5e51b7Smrg 951fe5e51b7Smrgcommit fe23ada5cc8c13fa30aa210df9968a4042593ea2 952fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 953fe5e51b7SmrgDate: Wed Jun 14 21:52:21 2006 +0000 954fe5e51b7Smrg 955fe5e51b7Smrg Refactor AccelFlags setting and some other feature settings for various MGA 956fe5e51b7Smrg hardware. Eventually AccelFlags will be set from a table look-up, but 957fe5e51b7Smrg that will come after the PCI rework is merged. 958fe5e51b7Smrg 959fe5e51b7Smrgcommit 72667a14fa330ef3b08dd72ab84ff09b164ff5ed 960fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 961fe5e51b7SmrgDate: Wed Apr 12 20:26:35 2006 +0000 962fe5e51b7Smrg 963fe5e51b7Smrg Bug #6562: s/MAXSHORT/SHRT_MAX/ for POSIX. (Matthieu Herrb) 964fe5e51b7Smrg 965fe5e51b7Smrgcommit f0a3923fe65abb04e64e3159b154f677e76423ca 966fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 967fe5e51b7SmrgDate: Sat Apr 8 01:33:58 2006 +0000 968fe5e51b7Smrg 969fe5e51b7Smrg Bump to 1.4.1 for Xv changes. 970fe5e51b7Smrg 971fe5e51b7Smrgcommit ae30dfebbd6883f1a863d193d6c8e971c0dec92b 972fe5e51b7SmrgAuthor: Aaron Plattner <aplattner@nvidia.com> 973fe5e51b7SmrgDate: Fri Apr 7 23:09:17 2006 +0000 974fe5e51b7Smrg 975fe5e51b7Smrg Add a DrawablePtr argument to the XV functions to pave the way for 976fe5e51b7Smrg redirected video. 977fe5e51b7Smrg 978fe5e51b7Smrgcommit 8bc544169adfed95b11062fe9816ecf31e35b014 979fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 980fe5e51b7SmrgDate: Fri Apr 7 19:21:13 2006 +0000 981fe5e51b7Smrg 982fe5e51b7Smrg Unlibcwrap. Bump server version requirement. Bump to 1.4.0. 983fe5e51b7Smrg 984fe5e51b7Smrgcommit 07373669514b104a11fb1b4ed5214f3764c83a2f 985fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 986fe5e51b7SmrgDate: Sun Apr 2 01:03:50 2006 +0000 987fe5e51b7Smrg 988fe5e51b7Smrg Bug #6328: Add support for Matrox G200SE chips. (Matrox) 989fe5e51b7Smrg 990fe5e51b7Smrgcommit 88ece3c37c4ed529686b6cdea1bf9b6eed8fceea 991fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 992fe5e51b7SmrgDate: Mon Mar 20 19:12:50 2006 +0000 993fe5e51b7Smrg 994fe5e51b7Smrg Bug #5587: Refactor mga_storm.c to only build once for all color depths. 995fe5e51b7Smrg (Ian Romanick) 996fe5e51b7Smrg 997fe5e51b7Smrgcommit 089c7be83d6cace94a692ec46a4c3a05b32fd4f4 998fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 999fe5e51b7SmrgDate: Wed Mar 15 20:21:23 2006 +0000 1000fe5e51b7Smrg 1001fe5e51b7Smrg Coverity #1009: Check for NULL first before assigning to pMGADRI. 1002fe5e51b7Smrg 1003fe5e51b7Smrgcommit 20eb3f159fe3629d1bfb6b9437912f55b690e068 1004fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1005fe5e51b7SmrgDate: Wed Mar 15 20:18:43 2006 +0000 1006fe5e51b7Smrg 1007fe5e51b7Smrg Coverity #92: Eliminate a dead code path. 1008fe5e51b7Smrg 1009fe5e51b7Smrgcommit 0be3b6f166709984611affad740bddaecd0bb880 1010fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1011fe5e51b7SmrgDate: Wed Dec 21 02:30:00 2005 +0000 1012fe5e51b7Smrg 1013fe5e51b7Smrg Update package version for X11R7 release. 1014fe5e51b7Smrg 1015fe5e51b7Smrgcommit 7c3b4b0ba321d2a96a6586db585e194102f51bfe 1016fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1017fe5e51b7SmrgDate: Mon Dec 19 16:25:53 2005 +0000 1018fe5e51b7Smrg 1019fe5e51b7Smrg Stub COPYING files 1020fe5e51b7Smrg 1021fe5e51b7Smrgcommit 216fcca904e358175f28b4685cdc657c4ebd2245 1022fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1023fe5e51b7SmrgDate: Mon Dec 19 09:07:50 2005 +0000 1024fe5e51b7Smrg 1025fe5e51b7Smrg Typo fixes, mailing list & url updates, and other changes to prepare for 1026fe5e51b7Smrg X11R6.9 & 7.0 releases. 1027fe5e51b7Smrg 1028fe5e51b7Smrgcommit 44ed6a4d7df5353068a1ec464aedee2754a0689c 1029fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1030fe5e51b7SmrgDate: Thu Dec 15 00:24:17 2005 +0000 1031fe5e51b7Smrg 1032fe5e51b7Smrg Update package version number for final X11R7 release candidate. 1033fe5e51b7Smrg 1034fe5e51b7Smrgcommit 051c589bc038a8f55754decfc90f4a87cec1d318 1035fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1036fe5e51b7SmrgDate: Tue Dec 6 22:48:35 2005 +0000 1037fe5e51b7Smrg 1038fe5e51b7Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 1039fe5e51b7Smrg 1040fe5e51b7Smrgcommit 8cd8149a942facfadd961b1ce5ab7a4ec4ab13f6 1041fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1042fe5e51b7SmrgDate: Sat Dec 3 05:49:34 2005 +0000 1043fe5e51b7Smrg 1044fe5e51b7Smrg Update package version number for X11R7 RC3 release. 1045fe5e51b7Smrg 1046fe5e51b7Smrgcommit 372574887ecbb78b5c88f9b70f380f18e22146c0 1047fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1048fe5e51b7SmrgDate: Fri Dec 2 02:16:08 2005 +0000 1049fe5e51b7Smrg 1050fe5e51b7Smrg Remove extraneous AC_MSG_RESULT. 1051fe5e51b7Smrg 1052fe5e51b7Smrgcommit 6431eaab73efce760730cc0214819d970fdd39f2 1053fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1054fe5e51b7SmrgDate: Wed Nov 30 18:51:34 2005 +0000 1055fe5e51b7Smrg 1056fe5e51b7Smrg Bump libdrm dep to 2.0. 1057fe5e51b7Smrg 1058fe5e51b7Smrgcommit 161a85033eecfb831d6772515b09074bd4632f3f 1059fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1060fe5e51b7SmrgDate: Tue Nov 29 23:29:59 2005 +0000 1061fe5e51b7Smrg 1062fe5e51b7Smrg Only build dlloader modules by default. 1063fe5e51b7Smrg 1064fe5e51b7Smrgcommit 352f65e64e1276511cb253bf52534a1f30776984 1065fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1066fe5e51b7SmrgDate: Mon Nov 28 22:04:09 2005 +0000 1067fe5e51b7Smrg 1068fe5e51b7Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 1069fe5e51b7Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 1070fe5e51b7Smrg 1071fe5e51b7Smrgcommit e29459c50ebcde0683aa6e33f936e8cee2eb93a9 1072fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1073fe5e51b7SmrgDate: Mon Nov 21 10:49:15 2005 +0000 1074fe5e51b7Smrg 1075fe5e51b7Smrg Add .cvsignores for drivers. 1076fe5e51b7Smrg 1077fe5e51b7Smrgcommit df888be94ca02f16e5dc2d1eabc4ede4b1e15369 1078fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1079fe5e51b7SmrgDate: Wed Nov 9 21:31:20 2005 +0000 1080fe5e51b7Smrg 1081fe5e51b7Smrg Bump version numbers for X11R6.9/X11R7 RC2. 1082fe5e51b7Smrg 1083fe5e51b7Smrgcommit 241c2b24d61266cd363f7e5f20ba8538482199df 1084fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1085fe5e51b7SmrgDate: Wed Nov 9 21:15:15 2005 +0000 1086fe5e51b7Smrg 1087fe5e51b7Smrg Update package version number for X11R7 RC2 release. 1088fe5e51b7Smrg 1089fe5e51b7Smrgcommit a04e08832096e7f6e0763fa17a3684da24916ffe 1090fe5e51b7SmrgAuthor: Matthias Hopf <mhopf@suse.de> 1091fe5e51b7SmrgDate: Wed Nov 9 17:42:58 2005 +0000 1092fe5e51b7Smrg 1093fe5e51b7Smrg Bug #4998: Add ';' and ',' as valid separators for MetaModes as well. 1094fe5e51b7Smrg 1095fe5e51b7Smrgcommit 00d81f8f104805702ee84c6d7781502bfe37f86b 1096fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1097fe5e51b7SmrgDate: Tue Nov 1 15:08:53 2005 +0000 1098fe5e51b7Smrg 1099fe5e51b7Smrg Update pkgcheck depedencies to work with separate build roots. 1100fe5e51b7Smrg 1101fe5e51b7Smrgcommit c906a237b118a80f7d9e1428ad7efd5f189232e6 1102fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1103fe5e51b7SmrgDate: Fri Oct 21 18:40:19 2005 +0000 1104fe5e51b7Smrg 1105fe5e51b7Smrg Bug #4829: Remove some useless DRI symbol checks. 1106fe5e51b7Smrg 1107fe5e51b7Smrgcommit f1db5fcc072b0066c7dbe42a2064200191ee759e 1108fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1109fe5e51b7SmrgDate: Wed Oct 19 02:48:03 2005 +0000 1110fe5e51b7Smrg 1111fe5e51b7Smrg Update package version number for RC1 release. 1112fe5e51b7Smrg 1113fe5e51b7Smrgcommit 12b4af203c4c228521c1095b6f08e02601486137 1114fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1115fe5e51b7SmrgDate: Tue Oct 18 00:01:53 2005 +0000 1116fe5e51b7Smrg 1117fe5e51b7Smrg Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro 1118fe5e51b7Smrg substitutions to work better with BSD make 1119fe5e51b7Smrg 1120fe5e51b7Smrgcommit 58ee3b290ef6b1366a1c241063120dece82802cb 1121fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1122fe5e51b7SmrgDate: Mon Oct 17 22:57:34 2005 +0000 1123fe5e51b7Smrg 1124fe5e51b7Smrg More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead 1125fe5e51b7Smrg of indirectly 1126fe5e51b7Smrg 1127fe5e51b7Smrgcommit e8f6552523f6a2f651fd596db263213eef5edcfe 1128fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1129fe5e51b7SmrgDate: Mon Oct 17 00:09:03 2005 +0000 1130fe5e51b7Smrg 1131fe5e51b7Smrg Use sed & cpp to substitute variables in driver man pages 1132fe5e51b7Smrg 1133fe5e51b7Smrgcommit 52497dac4be07bb5a4ca1a73ec6198851173b6c4 1134fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1135fe5e51b7SmrgDate: Tue Sep 27 20:53:19 2005 +0000 1136fe5e51b7Smrg 1137fe5e51b7Smrg Update build system for apm, chips, cirrus, glint, i740, mga, neomagic, 1138fe5e51b7Smrg newport to accomodate various new documentation and utility files. 1139fe5e51b7Smrg 1140fe5e51b7Smrgcommit d3a3818010a620ae57dd6831466ce9cd4137b28f 1141fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1142fe5e51b7SmrgDate: Fri Sep 9 23:15:45 2005 +0000 1143fe5e51b7Smrg 1144fe5e51b7Smrg Clean up some warnings. Fix some '#ifdef USEMGAHAL' issues that had caused 1145fe5e51b7Smrg the number of curl-braces to be unbalanced. 1146fe5e51b7Smrg 1147fe5e51b7Smrgcommit 000f59ff4686d1dbda673bf5a700f33615f9eb89 1148fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1149fe5e51b7SmrgDate: Fri Aug 26 07:10:29 2005 +0000 1150fe5e51b7Smrg 1151fe5e51b7Smrg Wrapping, escaped dashes, and other TeX syntax fixes throughout the 1152fe5e51b7Smrg manpage. (Branden Robinson, Debian #047) 1153fe5e51b7Smrg 1154fe5e51b7Smrgcommit b96b4242f98f7933fab7c1ffe95d04a8b602969e 1155fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1156fe5e51b7SmrgDate: Sun Aug 21 19:00:39 2005 +0000 1157fe5e51b7Smrg 1158fe5e51b7Smrg Fix DRI header checks, bump to 1.1.2.2. 1159fe5e51b7Smrg 1160fe5e51b7Smrgcommit db7dde6e7db534e47f43a0b371f5474d24fcaf0f 1161fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1162fe5e51b7SmrgDate: Sun Aug 21 01:11:46 2005 +0000 1163fe5e51b7Smrg 1164fe5e51b7Smrg programs/Xserver/hw/xfree86/drivers/mga/mga_bios.c #include "Xmd.h" -> 1165fe5e51b7Smrg <X11/Xmd.h> 1166fe5e51b7Smrg 1167fe5e51b7Smrgcommit 694247a948d68f711c822c2ffaa9032b3cf4255b 1168fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1169fe5e51b7SmrgDate: Thu Aug 18 09:03:47 2005 +0000 1170fe5e51b7Smrg 1171fe5e51b7Smrg Update autogen.sh to one that does objdir != srcdir. 1172fe5e51b7Smrg 1173fe5e51b7Smrgcommit eec95d13f408f5489fe8c6b611d080c275c541fb 1174fe5e51b7SmrgAuthor: Alan Hourihane <alanh@fairlite.demon.co.uk> 1175fe5e51b7SmrgDate: Mon Aug 15 07:30:05 2005 +0000 1176fe5e51b7Smrg 1177fe5e51b7Smrg Egbert's 64bit fixes for mixed 32/64bit clients 1178fe5e51b7Smrg 1179fe5e51b7Smrgcommit d4b7edf86b63fb9af377bc4605381c8016a683a5 1180fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1181fe5e51b7SmrgDate: Sun Aug 14 00:18:25 2005 +0000 1182fe5e51b7Smrg 1183fe5e51b7Smrg add mga_bios.c, bump version number. 1184fe5e51b7Smrg 1185fe5e51b7Smrgcommit 4c5535161d81174747920a2a3e70ec27a1bcf911 1186fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1187fe5e51b7SmrgDate: Fri Aug 5 23:04:33 2005 +0000 1188fe5e51b7Smrg 1189fe5e51b7Smrg I have resolved this by making all the "Direct rendering disabled" messages 1190fe5e51b7Smrg X_WARNING and all the "Direct rendering enabled" messages X_INFO. 1191fe5e51b7Smrg Ideally, we need to factor some of this stuff out to common code. There 1192fe5e51b7Smrg is a *LOT* of duplication among the *_dri.c files under 1193fe5e51b7Smrg programs/Xserver/hw/xfree86/drivers. 1194fe5e51b7Smrg I'm trying to clean up as much low hanging fruit as I can and got tired of 1195fe5e51b7Smrg waiting for ajax. :P 1196fe5e51b7Smrg 1197fe5e51b7Smrgcommit 4a7656a726cd6b848df65cbd9c18bbfd8e09fb47 1198fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1199fe5e51b7SmrgDate: Fri Aug 5 18:34:11 2005 +0000 1200fe5e51b7Smrg 1201fe5e51b7Smrg Now that Mesa has been merged into the tree, set the default value for 1202fe5e51b7Smrg OldDmaInit to false. 1203fe5e51b7Smrg 1204fe5e51b7Smrgcommit 22db234c995d12d3e538198b41fba0d555eb10c2 1205fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1206fe5e51b7SmrgDate: Sun Jul 31 17:19:29 2005 +0000 1207fe5e51b7Smrg 1208fe5e51b7Smrg Post-merge fixups: 1209fe5e51b7Smrg - Disable building the gamma driver 1210fe5e51b7Smrg - Fix numerous Imakefiles to get header paths and subdirs right 1211fe5e51b7Smrg - Symlink client-side GLX lib source from Mesa 1212fe5e51b7Smrg - Add new shader subdirs to the Mesa core build 1213fe5e51b7Smrg - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it, 1214fe5e51b7Smrg since they don't generate protocol, and it was breaking the build. 1215fe5e51b7Smrg 1216fe5e51b7Smrgcommit 67a25f0c366873050388928a6e712e8eed0e0e67 1217fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1218fe5e51b7SmrgDate: Fri Jul 29 21:22:43 2005 +0000 1219fe5e51b7Smrg 1220fe5e51b7Smrg Various changes preparing packages for RC0: 1221fe5e51b7Smrg - Verify and update package version numbers as needed 1222fe5e51b7Smrg - Implement versioning scheme 1223fe5e51b7Smrg - Change bug address to point to bugzilla bug entry form 1224fe5e51b7Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 1225fe5e51b7Smrg reenable it) 1226fe5e51b7Smrg - Fix makedepend to use pkgconfig and pass distcheck 1227fe5e51b7Smrg - Update build script to build macros first 1228fe5e51b7Smrg - Update modular Xorg version 1229fe5e51b7Smrg 1230fe5e51b7Smrgcommit 73d19fde3b2c78693298b60252e1a67e28cb708a 1231fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1232fe5e51b7SmrgDate: Thu Jul 28 15:48:19 2005 +0000 1233fe5e51b7Smrg 1234fe5e51b7Smrg Add missing backslash, patch from Donnie Berkholz 1235fe5e51b7Smrg 1236fe5e51b7Smrgcommit 3e06876c193d945f2df0c2521a2c80ec73ce5cb8 1237fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1238fe5e51b7SmrgDate: Wed Jul 27 21:23:29 2005 +0000 1239fe5e51b7Smrg 1240fe5e51b7Smrg Add xf86driproto to dependencies for drivers with DRI support. Patch from 1241fe5e51b7Smrg Donnie Berkholz 1242fe5e51b7Smrg 1243fe5e51b7Smrgcommit dccbba1b92e14df05aa351a28d4439ea4f625967 1244fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1245fe5e51b7SmrgDate: Wed Jul 27 07:38:14 2005 +0000 1246fe5e51b7Smrg 1247fe5e51b7Smrg Include binding.h to fix make distcheck 1248fe5e51b7Smrg 1249fe5e51b7Smrgcommit a5f5f658a9875ea2dfb01200305dab54ce4115ac 1250fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1251fe5e51b7SmrgDate: Tue Jul 26 18:29:39 2005 +0000 1252fe5e51b7Smrg 1253fe5e51b7Smrg symlink.sh: add binding.h from mga/HALlib add nsc/gfx add nsc/panel 1254fe5e51b7Smrg glint_driver.c: remove include of cfb8_32.h mga_driver.c: remove 1255fe5e51b7Smrg include of cfb8_32.h modularizevideodriver.sh: fix typo 1256fe5e51b7Smrg 1257fe5e51b7Smrgcommit efca764ce95094531baf14daf6e5e538cc1e9210 1258fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1259fe5e51b7SmrgDate: Tue Jul 26 01:18:43 2005 +0000 1260fe5e51b7Smrg 1261fe5e51b7Smrg "Build system for `basename $PWD | sed s/xf86-video-//`" 1262fe5e51b7Smrg 1263fe5e51b7Smrgcommit e2f4c1e72976180cfbf2486236468e25f81ca431 1264fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1265fe5e51b7SmrgDate: Tue Jul 26 00:01:58 2005 +0000 1266fe5e51b7Smrg 1267fe5e51b7Smrg Famous last words: "This last change is so trivial, I don't even need to 1268fe5e51b7Smrg compile-test it!" This commit fixes a dumb-dumb error by me. I broke 1269fe5e51b7Smrg the multi-line X_ERROR message into multiple xf86DrvMsg calls to get 1270fe5e51b7Smrg the formating correct in the log. However, I didn't bother to put in 1271fe5e51b7Smrg the correct punctuation when I did so. 1272fe5e51b7Smrg 1273fe5e51b7Smrgcommit fdb59d2535d7d517a14f3d6489ba91f3dac3b99f 1274fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1275fe5e51b7SmrgDate: Mon Jul 25 23:14:50 2005 +0000 1276fe5e51b7Smrg 1277fe5e51b7Smrg PInS data on later cards (G200 and later) contains information about the 1278fe5e51b7Smrg physical bus used for the card. This allows accurate detection of PCI 1279fe5e51b7Smrg cards that use a PCI-to-PCI bridge with an AGP chip. 1280fe5e51b7Smrg Correctly disable DRI on PCI cards used with pre-3.2 DRM. Previously the 1281fe5e51b7Smrg test was performed based on PCI ID (see above for why this is wrong) 1282fe5e51b7Smrg and was done *before* the DRM version was known. 1283fe5e51b7Smrg Bug #3759: <https://bugs.freedesktop.org/show_bug.cgi?id=3759> Correctly 1284fe5e51b7Smrg determine the PLL reference frequency from the PInS data. Previously 1285fe5e51b7Smrg the wrong bit was tested. Blame the dumb programmer that used 1286fe5e51b7Smrg cut-and-paste (that would be me). 1287fe5e51b7Smrg 1288fe5e51b7Smrgcommit 6030e8206db010f65199cbf5d332d2b47cdb3580 1289fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1290fe5e51b7SmrgDate: Mon Jul 11 02:29:51 2005 +0000 1291fe5e51b7Smrg 1292fe5e51b7Smrg Prep for modular builds by adding guarded #include "config.h" everywhere. 1293fe5e51b7Smrg 1294fe5e51b7Smrgcommit b52ca7871cb6cf7a01210ec21cd9c20e5453f4fd 1295fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1296fe5e51b7SmrgDate: Sun Jul 3 03:28:27 2005 +0000 1297fe5e51b7Smrg 1298fe5e51b7Smrg Fix build issues. 1299fe5e51b7Smrg 1300fe5e51b7Smrgcommit 800579ef040cf5df4a8b09a4a8db6118c3d84980 1301fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1302fe5e51b7SmrgDate: Fri Jul 1 16:21:35 2005 +0000 1303fe5e51b7Smrg 1304fe5e51b7Smrg Re-write the PInS processing code 1305fe5e51b7Smrg This patch dumps all of the old BIOS processing code from the MGA DDX. The 1306fe5e51b7Smrg new code, located in mga_bios.c, is modeled after the code in 1307fe5e51b7Smrg matroxfb_misc.c (though no actual code was copied). Basically, the BIOS 1308fe5e51b7Smrg is processed in one place, with "device independent" values stored in a 1309fe5e51b7Smrg data structure. This data is then used, without extra switch-statments, 1310fe5e51b7Smrg throughout the driver. 1311fe5e51b7Smrg In addition, this patch adds support for processing the BIOS on PowerPC 1312fe5e51b7Smrg systems. On PPC cards, the magic offset values (that give the location 1313fe5e51b7Smrg of the PInS data) is not in the BIOS. Instead the driver has to search 1314fe5e51b7Smrg the BIOS for the PInS structure signature. The patch does this and 1315fe5e51b7Smrg correctly handles byte-ordering (and data alignement) issues. 1316fe5e51b7Smrg This code has been tested on an AGP G400 on x86 and a PCI G450 on PowerPC. 1317fe5e51b7Smrg NOTE: The file mga_bios.h is also removed. The "documentation" in that file 1318fe5e51b7Smrg was moved to the file mga_PInS.txt. This file documents, as much as 1319fe5e51b7Smrg possible, the layout of the various PInS datastructure versions. The 1320fe5e51b7Smrg information in that file is 100% based on the old mga_bios.h and the 1321fe5e51b7Smrg code in matroxfb_misc.c. No additional information from Matrox 1322fe5e51b7Smrg documentation is included in that file. This just puts the information 1323fe5e51b7Smrg that was already known in one place. 1324fe5e51b7Smrg Xorg Bug: 3553 1325fe5e51b7Smrg 1326fe5e51b7Smrgcommit acadff30e40af48592e50e55a94f9c81ab856971 1327fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1328fe5e51b7SmrgDate: Sat Jun 25 21:16:55 2005 +0000 1329fe5e51b7Smrg 1330fe5e51b7Smrg Bug #3626: _X_EXPORT tags for video and input drivers. 1331fe5e51b7Smrg 1332fe5e51b7Smrgcommit 784cd8fabf5a356a8ce501c635e4d09f39a17a0f 1333fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1334fe5e51b7SmrgDate: Thu Jun 16 00:11:24 2005 +0000 1335fe5e51b7Smrg 1336fe5e51b7Smrg Actually commit fix for #3528 1337fe5e51b7Smrg 1338fe5e51b7Smrgcommit 89db1e50a85521189926e1e73b1ddfb4a3e12be0 1339fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1340fe5e51b7SmrgDate: Wed Jun 15 22:38:36 2005 +0000 1341fe5e51b7Smrg 1342fe5e51b7Smrg Temporary fixes to work-around the "old" MGA client-side driver in the 1343fe5e51b7Smrg tree. 1344fe5e51b7Smrg 1345fe5e51b7Smrgcommit a6e0ae358bdb26452444d916a956c07da7fe88f4 1346fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1347fe5e51b7SmrgDate: Wed Jun 15 20:06:43 2005 +0000 1348fe5e51b7Smrg 1349fe5e51b7Smrg Adds support for MGA DRM version 3.2. 1350fe5e51b7Smrg Update MGA DDX to use new features of MGA DRM ersion 3.2 to enable DRI 1351fe5e51b7Smrg support on PCI cards. Backwards compatability with older client-side 1352fe5e51b7Smrg drivers is enabled with new Device section settings. See mga.man for 1353fe5e51b7Smrg details. 1354fe5e51b7Smrg Xorg bug: 3259 Reviewed by: Eric Anholt 1355fe5e51b7Smrg 1356fe5e51b7Smrgcommit c2e50aad47ce32f528dad2abee8b7a8df363c93e 1357fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1358fe5e51b7SmrgDate: Tue Jun 7 23:20:02 2005 +0000 1359fe5e51b7Smrg 1360fe5e51b7Smrg Numerous comments, clean-ups, and refactorings for the DRI portion of the 1361fe5e51b7Smrg MGA driver. 1362fe5e51b7Smrg - Use mga_drm.h instead of mga_common.h. Due to this, all the MGA-specific 1363fe5e51b7Smrg DRM names were changed to generic versions (i.e., drmMGALock became 1364fe5e51b7Smrg drm_lock_t). 1365fe5e51b7Smrg - Merge MGADRIMapInit into MGADRIAGPInit and rename the resulting function 1366fe5e51b7Smrg MGADRIBootstrapDMA. 1367fe5e51b7Smrg - Eliminate several unnecessary drmMap calls. The server has no need to map 1368fe5e51b7Smrg MMIO space, primary DMA buffer space, secondary DMA buffer space, WARP 1369fe5e51b7Smrg microcode space, or the DRM status page. 1370fe5e51b7Smrg - Clarified which portions of the client / server DRI interface are no 1371fe5e51b7Smrg longer used. 1372fe5e51b7Smrg - Removed some unused fields from MGADRIServerPrivateRec. 1373fe5e51b7Smrg - Bump MGA_PATCHLEVEL. 1374fe5e51b7Smrg Reviewed by: Adam Jackson Reviewed by: Eric Anholt 1375fe5e51b7Smrg 1376fe5e51b7Smrgcommit f4b3779cafdbcfeaddf6f55c4b2c67a667ab5d14 1377fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1378fe5e51b7SmrgDate: Wed May 18 17:47:35 2005 +0000 1379fe5e51b7Smrg 1380fe5e51b7Smrg Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version 1381fe5e51b7Smrg number of the DRIInfoRec, disambiguating it from the XF86DRI protocol 1382fe5e51b7Smrg version number. Modify DRIQueryVersion to return the libdri version 1383fe5e51b7Smrg number, which all DDXes were requesting implicitly. Fix the DDXes to 1384fe5e51b7Smrg check for the DRIINFO version they were compiled against. 1385fe5e51b7Smrg 1386fe5e51b7Smrgcommit 1b6392ffb792212016e710aaf27ffe36e5703d36 1387fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1388fe5e51b7SmrgDate: Wed Apr 20 12:25:28 2005 +0000 1389fe5e51b7Smrg 1390fe5e51b7Smrg Fix includes right throughout the Xserver tree: 1391fe5e51b7Smrg change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; 1392fe5e51b7Smrg change "foo.h", "extensions/foo.h" and "X11/foo.h" to 1393fe5e51b7Smrg <X11/extensions/foo.h> for extension headers, e.g. Xv.h; 1394fe5e51b7Smrg change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. 1395fe5e51b7Smrg 1396fe5e51b7Smrgcommit 58e70eb5ef3b0a2d4ac2950c45670a660691b1f6 1397fe5e51b7SmrgAuthor: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> 1398fe5e51b7SmrgDate: Sat Dec 4 00:43:09 2004 +0000 1399fe5e51b7Smrg 1400fe5e51b7Smrg Encoding of numerous files changed to UTF-8 1401fe5e51b7Smrg 1402fe5e51b7Smrgcommit 99eab59d167595a7deefc55b2c3226bc861a4986 1403fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1404fe5e51b7SmrgDate: Mon Aug 16 09:13:14 2004 +0000 1405fe5e51b7Smrg 1406fe5e51b7Smrg Bug #1087: Make sure all the *Weak symbols are documented in the import 1407fe5e51b7Smrg list, so the loader knows not to complain about unresolved symbols when 1408fe5e51b7Smrg an optional module isn't loaded. This typically manifests as warnings 1409fe5e51b7Smrg about fbdevHW symbols when the user isn't using the framebuffer 1410fe5e51b7Smrg console. 1411fe5e51b7Smrg 1412fe5e51b7Smrgcommit f29f2239d31232e152744321c447035ede658ce2 1413fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1414fe5e51b7SmrgDate: Fri Aug 13 18:24:08 2004 +0000 1415fe5e51b7Smrg 1416fe5e51b7Smrg Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com> 1417fe5e51b7Smrg Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike 1418fe5e51b7Smrg Harris. 1419fe5e51b7Smrg Call xf86EnableDisableFBAccess though the function pointer instead of 1420fe5e51b7Smrg directly. #1041, Patch from Aaron Plattner. 1421fe5e51b7Smrg Swap the phsyical size of the screen when rotiation. #1050, Patch from 1422fe5e51b7Smrg Aaron Plattner. 1423fe5e51b7Smrg Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com> 1424fe5e51b7Smrg Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead 1425fe5e51b7Smrg of proping it. This way it will work with the monolithic version too. 1426fe5e51b7Smrg #1062, Patch by Owen Taylor. 1427fe5e51b7Smrg 1428fe5e51b7Smrgcommit d9e1c04184e016604a9c84d53970c783f0849d2a 1429fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 1430fe5e51b7SmrgDate: Mon Aug 9 22:37:22 2004 +0000 1431fe5e51b7Smrg 1432fe5e51b7Smrg Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339, 1433fe5e51b7Smrg Harold L. Hunt II, Alexander Gottwald). 1434fe5e51b7Smrg Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao, 1435fe5e51b7Smrg David Dawes). 1436fe5e51b7Smrg Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson). 1437fe5e51b7Smrg HP-PA build fix (Bug #828, Guy Martin, Paul Anderson). 1438fe5e51b7Smrg Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine). 1439fe5e51b7Smrg Fix attempt to read video ROM before enabling it (Bug #843, Ivan 1440fe5e51b7Smrg Kokshaysky, Mike A. Harris). 1441fe5e51b7Smrg Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A. 1442fe5e51b7Smrg Harris). 1443fe5e51b7Smrg Clarify xset man page description of how to use the keyboard repeat rate 1444fe5e51b7Smrg settings (Bug #846, Mike A. Harris). 1445fe5e51b7Smrg Fix problem where print-screen key would get remapped to sys-req in certain 1446fe5e51b7Smrg keymaps, which broke GNOME printscreen functionality (Bug #847, Owen 1447fe5e51b7Smrg Taylor). 1448fe5e51b7Smrg Fix several render problems: 1449fe5e51b7Smrg - MMIO mode support 1450fe5e51b7Smrg - Hang on IGP chips 1451fe5e51b7Smrg - VT switching hang 1452fe5e51b7Smrg - 3D render corruption (Bug #922, Hui Yu). 1453fe5e51b7Smrg 1454fe5e51b7Smrgcommit 7043429714bbe667f74ead4e5f3465e27695c996 1455fe5e51b7SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 1456fe5e51b7SmrgDate: Tue Aug 3 08:52:16 2004 +0000 1457fe5e51b7Smrg 1458fe5e51b7Smrg Fix declaration of XAACachePlanarMonoStippleProc. Rename 1459fe5e51b7Smrg XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for 1460fe5e51b7Smrg consistency with other parts of xaa and fix forward declaration in 1461fe5e51b7Smrg xaalocal.h. Fixes last comments on Bug #962. 1462fe5e51b7Smrg 1463fe5e51b7Smrgcommit a44da97b743cf5f131bb6a7709ba72e30701be8b 1464fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1465fe5e51b7SmrgDate: Tue Aug 3 02:44:21 2004 +0000 1466fe5e51b7Smrg 1467fe5e51b7Smrg Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so 1468fe5e51b7Smrg DoLoadableServer NO builds work again. 1469fe5e51b7Smrg 1470fe5e51b7Smrgcommit 4db80992d38311deaefdbe5da1c41b2c14102e1a 1471fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1472fe5e51b7SmrgDate: Sat Jul 31 01:21:18 2004 +0000 1473fe5e51b7Smrg 1474fe5e51b7Smrg Change several LoaderSymbol calls introduced by the bug #400 patch to 1475fe5e51b7Smrg *Weak() resolver functions. 1476fe5e51b7Smrg 1477fe5e51b7Smrgcommit dd173d29d2c2bd73bea8eef018b1c6dd6b7a967c 1478fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1479fe5e51b7SmrgDate: Fri Jul 30 20:30:52 2004 +0000 1480fe5e51b7Smrg 1481fe5e51b7Smrg Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all 1482fe5e51b7Smrg framebuffer formats except cfb and the overlay modes should work, and 1483fe5e51b7Smrg r128 and radeon need to be loaded from the ati driver (both issues to 1484fe5e51b7Smrg be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga 1485fe5e51b7Smrg drivers. elfloader users shouldn't be affected. 1486fe5e51b7Smrg 1487fe5e51b7Smrgcommit e12aa54892259cdfef7c0f9419b58f0b9d4163d7 1488fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1489fe5e51b7SmrgDate: Fri Jul 30 18:40:36 2004 +0000 1490fe5e51b7Smrg 1491fe5e51b7Smrg Fixed typo in a comment. 1492fe5e51b7Smrg Deleted bogus comment. 1493fe5e51b7Smrg Added debugging support. 1494fe5e51b7Smrg 1495fe5e51b7Smrgcommit 4f86d37662c0fe3f27a886f7947e009235103e6b 1496fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 1497fe5e51b7SmrgDate: Tue Jul 27 02:55:47 2004 +0000 1498fe5e51b7Smrg 1499fe5e51b7Smrg - add mga_maven.h; needed for mga maven support (Ryan Underwood) 1500fe5e51b7Smrg 1501fe5e51b7Smrgcommit 9ae7f9446d049a1fad550f5f681bc557de158c10 1502fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 1503fe5e51b7SmrgDate: Tue Jul 27 02:50:41 2004 +0000 1504fe5e51b7Smrg 1505fe5e51b7Smrg - enable maven support for TV detection, DPMS, and DDC on crtc2 on G400 1506fe5e51b7Smrg (Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098) 1507fe5e51b7Smrg - expose I2CStart; needed for mga maven support (Ryan Underwood) 1508fe5e51b7Smrg 1509fe5e51b7Smrgcommit 8b030a847771f6b34bf38913eb6b53543f320f29 1510fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 1511fe5e51b7SmrgDate: Mon Jul 26 23:14:37 2004 +0000 1512fe5e51b7Smrg 1513fe5e51b7Smrg - Add Radeon DynamicClocks option 1514fe5e51b7Smrg - Add small fixes and clean ups from ati's last code drop (typo_fixes, 1515fe5e51b7Smrg remove_fudge, laptop, xvfix) 1516fe5e51b7Smrg - fix possible segfault in mga_dri.c (Ryan Underwood) 1517fe5e51b7Smrg - Add Xv support to pre-nm2160 neomagic chipsets 1518fe5e51b7Smrg 1519fe5e51b7Smrgcommit e9a123f08880882a519b6eba8305d62ac375ca10 1520fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1521fe5e51b7SmrgDate: Wed Jun 16 09:44:00 2004 +0000 1522fe5e51b7Smrg 1523fe5e51b7Smrg Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, 1524fe5e51b7Smrg with the following notes: 1525fe5e51b7Smrg - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to 1526fe5e51b7Smrg insecurity. 1527fe5e51b7Smrg - VIA driver converted to new drmContext and drmHandle names. 1528fe5e51b7Smrg - Radeon driver merge conflicted in many places, and MergedFB at least 1529fe5e51b7Smrg could probably use some checking at this point. 1530fe5e51b7Smrg 1531fe5e51b7Smrgcommit 1ca2311bee53e99b49a860862e4010e58c918585 1532fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1533fe5e51b7SmrgDate: Wed Jun 16 09:26:24 2004 +0000 1534fe5e51b7Smrg 1535fe5e51b7Smrg DRI trunk-20040613 import 1536fe5e51b7Smrg 1537fe5e51b7Smrgcommit 7cbb9f870b020742a254f1e9aadd0209b1f0a876 1538fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1539fe5e51b7SmrgDate: Wed Jun 16 09:23:24 2004 +0000 1540fe5e51b7Smrg 1541fe5e51b7Smrg DRI XFree86-4_3_99_12-merge import 1542fe5e51b7Smrg 1543fe5e51b7Smrgcommit 9dd51de1d530c6081333d30f945afb6d9208a77f 1544fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1545fe5e51b7SmrgDate: Fri Apr 23 19:38:38 2004 +0000 1546fe5e51b7Smrg 1547fe5e51b7Smrg Merging XORG-CURRENT into trunk 1548fe5e51b7Smrg 1549fe5e51b7Smrgcommit f02d171b227e657f02a0b99a28cff7cbda21a583 1550fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1551fe5e51b7SmrgDate: Sun Mar 14 08:33:25 2004 +0000 1552fe5e51b7Smrg 1553fe5e51b7Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 1554fe5e51b7Smrg 1555fe5e51b7Smrgcommit d8072750f830173e3c9eefae8364d12190b20c26 1556fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1557fe5e51b7SmrgDate: Wed Mar 3 12:12:19 2004 +0000 1558fe5e51b7Smrg 1559fe5e51b7Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 1560fe5e51b7Smrg 1561fe5e51b7Smrgcommit ddb58a6e1be274dce96cc7c29965a45c2294c5d3 1562fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1563fe5e51b7SmrgDate: Thu Feb 26 13:35:53 2004 +0000 1564fe5e51b7Smrg 1565fe5e51b7Smrg readding XFree86's cvs IDs 1566fe5e51b7Smrg 1567fe5e51b7Smrgcommit 0d050fbd293089d93bd78b58b1b454dc2ced8cdf 1568fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 1569fe5e51b7SmrgDate: Thu Feb 26 09:23:19 2004 +0000 1570fe5e51b7Smrg 1571fe5e51b7Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 1572fe5e51b7Smrg 1573fe5e51b7Smrgcommit 64c0cb99b62c87052374f63d3e31e2603eab2f9c 1574fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1575fe5e51b7SmrgDate: Mon Feb 23 20:35:03 2004 +0000 1576fe5e51b7Smrg 1577fe5e51b7Smrg Import most of XFree86 4.4RC3. This import excludes files which have the 1578fe5e51b7Smrg new license. If we want to, later we can import 4.4RC3 again and pick 1579fe5e51b7Smrg up the files that have the new license, but for now the vendor branch 1580fe5e51b7Smrg is "pure." 1581fe5e51b7Smrg 1582fe5e51b7Smrgcommit bf37df17ecf040836ad8924a9174787d0f57ed5a 1583fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1584fe5e51b7SmrgDate: Tue Nov 25 19:28:37 2003 +0000 1585fe5e51b7Smrg 1586fe5e51b7Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 1587fe5e51b7Smrg 1588fe5e51b7Smrgcommit d3b3c858814952bc7344a4154e981851fd9bb494 1589fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1590fe5e51b7SmrgDate: Fri Nov 14 16:48:55 2003 +0000 1591fe5e51b7Smrg 1592fe5e51b7Smrg XFree86 4.3.0.1 1593fe5e51b7Smrg 1594fe5e51b7Smrgcommit 1e444800e5935c1c5678aaa9fa3751c4519f42e4 1595fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1596fe5e51b7SmrgDate: Fri Nov 14 16:48:55 2003 +0000 1597fe5e51b7Smrg 1598fe5e51b7Smrg Initial revision 1599