ChangeLog revision 493f84f4
1493f84f4Smrgcommit 8ed77eb7920f375e9490a31f907eccb02fb123cd 2493f84f4SmrgAuthor: Matt Turner <mattst88@gmail.com> 3493f84f4SmrgDate: Thu Feb 19 13:39:18 2015 -0800 4493f84f4Smrg 5493f84f4Smrg xf86-video-mga 1.6.4 6493f84f4Smrg 7493f84f4Smrgcommit 132dee029e36c9a91a85f178885e94a9f9b5ee37 8493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com> 9493f84f4SmrgDate: Tue Jul 29 14:35:46 2014 -0400 10493f84f4Smrg 11493f84f4Smrg undef DISABLE_VGA_IO 12493f84f4Smrg 13493f84f4Smrg Dead conditional ever since m12n, must not be needed. 14493f84f4Smrg 15493f84f4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 16493f84f4Smrg 17493f84f4Smrgcommit cf46b1017a2663c59f07abd417573b9580f0145f 18493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com> 19493f84f4SmrgDate: Tue Jul 29 09:14:15 2014 -0400 20493f84f4Smrg 21493f84f4Smrg dri: Stop (uselessly) initializing the ValidateTree hooks 22493f84f4Smrg 23493f84f4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 24493f84f4Smrg 25493f84f4Smrgcommit 1a5bc65f27e76263818a44ddbc4197f6083077cf 26493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com> 27493f84f4SmrgDate: Thu May 22 12:48:27 2014 -0400 28493f84f4Smrg 29493f84f4Smrg man: Don't mention the HAL 30493f84f4Smrg 31493f84f4Smrg I mentioned it once, but I think I got away with it all right. 32493f84f4Smrg 33493f84f4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 34493f84f4Smrg 35493f84f4Smrgcommit d2c65c24e94dca1e8fb16c851d0e2fe41bf5d1c6 36493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com> 37493f84f4SmrgDate: Thu Mar 13 23:17:52 2014 -0400 38493f84f4Smrg 39493f84f4Smrg fix a type in previous lockup in the mga driver fix 40493f84f4Smrg 41493f84f4Smrg Oh, I had a typo in that patch - so please commit this to fix it. 42493f84f4Smrg 43493f84f4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 44493f84f4Smrg 45493f84f4Smrgcommit 0789f3f2799e6497e9e2e7488da679c03b7fa468 46493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com> 47493f84f4SmrgDate: Thu Mar 13 18:25:56 2014 -0400 48493f84f4Smrg 49493f84f4Smrg xf86-video-mga: fix a lockup in the mga driver 50493f84f4Smrg 51493f84f4Smrg I've had a Xserver lockup in the mga driver, examining it with gdb showed 52493f84f4Smrg this obviously broken loop: 53493f84f4Smrg count = INREG(MGAREG_VCOUNT) + 2; 54493f84f4Smrg while(INREG(MGAREG_VCOUNT) < count); 55493f84f4Smrg 56493f84f4Smrg It reads the line counter and waits until the counter advances by two. The 57493f84f4Smrg cause of the lockup is this - if the kernel reschedules the Xorg process 58493f84f4Smrg and lets it run in such a moment when INREG(MGAREG_VCOUNT) returns the 59493f84f4Smrg maximum (or maximum minus 1) line count, the loop never exits. 60493f84f4Smrg 61493f84f4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 62493f84f4Smrg 63493f84f4Smrgcommit 62ba63f687d7b99aff7c88ffd2774f15a2471ce0 64493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com> 65493f84f4SmrgDate: Fri Jan 17 16:04:26 2014 -0500 66493f84f4Smrg 67493f84f4Smrg xf86-video-mga: set the pan_ctl register 68493f84f4Smrg 69493f84f4Smrg On my Matrox G550 most videomodes in Xorg didn't work. I found out that it 70493f84f4Smrg works if Xorg pixel clock is similar to the pixel clock set on framebuffer 71493f84f4Smrg console. 72493f84f4Smrg 73493f84f4Smrg Further analysis showed that the Linux framebuffer driver sets the pan_ctl 74493f84f4Smrg register (the register 0xa2) according to the pixel clock, the Xorg driver 75493f84f4Smrg doesn't set it. 76493f84f4Smrg 77493f84f4Smrg I copied the code to set the pan_ctl register from the Linux kernel to the 78493f84f4Smrg Xorg driver, and most videomodes in Xorg work. 79493f84f4Smrg 80493f84f4Smrg The pan_ctl register is required for both analog and digital output. 81493f84f4Smrg 82493f84f4Smrg The pan_ctl register is saved and restored, this is required so that we 83493f84f4Smrg restore text-mode screen or Linux framebuffer correctly. 84493f84f4Smrg 85493f84f4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 86493f84f4Smrg 87acd6767fSmrgcommit f647727a2c1d4c2a9261c411cd3df71c3c9f0c06 88acd6767fSmrgAuthor: Dave Airlie <airlied@redhat.com> 89acd6767fSmrgDate: Thu Dec 5 12:09:27 2013 +1000 90acd6767fSmrg 91acd6767fSmrg mga: bump release to 1.6.3 92acd6767fSmrg 93acd6767fSmrgcommit 55525bdfc00b0b746401f6ea6ed289048e9d06eb 94acd6767fSmrgAuthor: Dave Airlie <airlied@redhat.com> 95acd6767fSmrgDate: Thu Dec 5 11:51:39 2013 +1000 96acd6767fSmrg 97acd6767fSmrg mga: fix XAA runtime 98acd6767fSmrg 99acd6767fSmrg XAA->USE_XAA add USE_XAA. 100acd6767fSmrg 101acd6767fSmrg Tested-by: Avengence on #xorg-devel 102acd6767fSmrg Signed-off-by: Dave Airlie <airlied@redhat.com> 103acd6767fSmrg 104acd6767fSmrgcommit 6aa94687233f55a8044efe83cac82b04ab19609f 105acd6767fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 106acd6767fSmrgDate: Sun Nov 17 10:27:42 2013 -0800 107acd6767fSmrg 108acd6767fSmrg Remove mga_esc.c vestigal stub 109acd6767fSmrg 110acd6767fSmrg Previously contained MGA HAL code, was left an empty shell by the 111acd6767fSmrg removal of USEMGAHAL in commit 94bbeb132c7eda. 112acd6767fSmrg 113acd6767fSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 114acd6767fSmrg Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> 115acd6767fSmrg 116acd6767fSmrgcommit e9109a0b04695d6971c94abe271dda2dc1a5e886 117acd6767fSmrgAuthor: Tormod Volden <debian.tormod@gmail.com> 118acd6767fSmrgDate: Thu Oct 31 22:48:18 2013 +0100 119acd6767fSmrg 120acd6767fSmrg mga: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr 121acd6767fSmrg 122acd6767fSmrg Signed-off-by: Tormod Volden <debian.tormod@gmail.com> 123acd6767fSmrg 124acd6767fSmrgcommit a77b9c5143591672fbe56f4428ced439c1f4d0f3 125acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org> 126acd6767fSmrgDate: Mon Jul 29 13:02:21 2013 +0200 127acd6767fSmrg 128acd6767fSmrg Disable HW cursor by default on G200 server chips 129acd6767fSmrg 130acd6767fSmrg Disable HW cursor by default on G200 server chips as these chips a 131acd6767fSmrg re often used with a remote graphics link which cannot display 132acd6767fSmrg the HW cursor. 133acd6767fSmrg This can be overridden by a config option. 134acd6767fSmrg Most desktops today use ARGB cursors anyhow which are not 135acd6767fSmrg supported by this driver anyhow. Thus the performance penalty 136acd6767fSmrg should be irrelevant. 137acd6767fSmrg 138acd6767fSmrg Signed-off-by: Egbert Eich <eich@freedesktop.org> 139acd6767fSmrg 140acd6767fSmrgcommit dba8778b9214dc3794198029fc6d59b3e97700d4 141acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org> 142acd6767fSmrgDate: Mon Jul 29 13:01:45 2013 +0200 143acd6767fSmrg 144acd6767fSmrg Restructure code to make it more readable 145acd6767fSmrg 146acd6767fSmrg With the previous structure it wasn't immediately clear when SecondCrtc 147acd6767fSmrg and HWCursor were set to which value. Make the code more readable. 148acd6767fSmrg 149acd6767fSmrg Signed-off-by: Egbert Eich <eich@freedesktop.org> 150acd6767fSmrg 151acd6767fSmrgcommit cbcee5de1ba02c8a58bae932a0cb98093dccefd9 152acd6767fSmrgAuthor: Tormod Volden <debian.tormod@gmail.com> 153acd6767fSmrgDate: Thu Oct 17 22:01:20 2013 +0200 154acd6767fSmrg 155acd6767fSmrg Fix dual head crash without XAA 156acd6767fSmrg 157acd6767fSmrg https://launchpad.net/bugs/1180986 158acd6767fSmrg 159acd6767fSmrg Signed-off-by: Tormod Volden <debian.tormod@gmail.com> 160acd6767fSmrg Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com> 161acd6767fSmrg Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com> 162acd6767fSmrg 163acd6767fSmrgcommit 15815c8612694a89d0d8593b3e603fdcdeacdd05 164acd6767fSmrgAuthor: Andy MacLean <andy-ub1@themacleans.org.uk> 165acd6767fSmrgDate: Thu Oct 17 19:51:36 2013 +0200 166acd6767fSmrg 167acd6767fSmrg Unbreak dual head (xinerama) 168acd6767fSmrg 169acd6767fSmrg This patch has been used in Debian, Ubuntu and Gentoo for years. 170acd6767fSmrg 171acd6767fSmrg https://bugs.freedesktop.org/show_bug.cgi?id=18472 172acd6767fSmrg https://launchpad.net/bugs/292214 173acd6767fSmrg https://bugs.gentoo.org/show_bug.cgi?id=265100 174acd6767fSmrg 175acd6767fSmrg Signed-off-by: Andy MacLean <andy-ub1@themacleans.org.uk> 176acd6767fSmrg Reviewed-by: Cyril Brulebois <kibi@debian.org> 177acd6767fSmrg Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com> 178acd6767fSmrg Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com> 179acd6767fSmrg 180acd6767fSmrgcommit 12af175fee1d3f6f17f8391ec642d904deca3783 181acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org> 182acd6767fSmrgDate: Tue Jun 7 19:31:16 2011 +0200 183acd6767fSmrg 184acd6767fSmrg Disable Linear Expansion on BE 185acd6767fSmrg 186acd6767fSmrg Linear Expansion doesn't work on BE as the bit order in 187acd6767fSmrg a word is reversed. ScreenToScreenColorExpansion allows 188acd6767fSmrg to adjust the bit order in a byte, still the bytes have 189acd6767fSmrg the wrong order. 190acd6767fSmrg 191acd6767fSmrg Reviewed-by: <wharms@bfs.de> 192acd6767fSmrg Signed-off-by: Egbert Eich <eich@freedesktop.org> 193acd6767fSmrg 194acd6767fSmrgcommit 49381ff2c3aa98be5bb84494b2ad3f81a0d31bcc 195acd6767fSmrgAuthor: Julien Cristau <jcristau@debian.org> 196acd6767fSmrgDate: Mon Jan 7 23:04:36 2013 +0100 197acd6767fSmrg 198acd6767fSmrg Restrict kernel driver matching to g200 server chips 199acd6767fSmrg 200acd6767fSmrg Otherwise we might catch devices handled by matroxfb, not the mgag200 201acd6767fSmrg kms driver. 202acd6767fSmrg 203acd6767fSmrg Debian bug#697532 204acd6767fSmrg 205acd6767fSmrg Reported-by: olafBuddenhagen@gmx.net 206acd6767fSmrg Reviewed-by: Dave Airlie <airlied@redhat.com> 207acd6767fSmrg Signed-off-by: Julien Cristau <jcristau@debian.org> 208acd6767fSmrg 2090bb88ba4Smrgcommit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d 2100bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2110bb88ba4SmrgDate: Fri Sep 28 11:36:44 2012 +1000 2120bb88ba4Smrg 2130bb88ba4Smrg mga: bump release to 1.6.2 2140bb88ba4Smrg 2150bb88ba4Smrgcommit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6 2160bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2170bb88ba4SmrgDate: Fri Sep 28 10:54:00 2012 +1000 2180bb88ba4Smrg 2190bb88ba4Smrg mga: bring dri1 back to life. 2200bb88ba4Smrg 2210bb88ba4Smrg we need to at least setup the memory manager bits so dri1 clients 2220bb88ba4Smrg get a backbuffer. this at least gets gears working again without XAA. 2230bb88ba4Smrg 2240bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2250bb88ba4Smrg 2260bb88ba4Smrgcommit e777a2845bfeefad386db35d694e4b1cd74a0dd5 2270bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2280bb88ba4SmrgDate: Wed Sep 26 15:18:44 2012 +1000 2290bb88ba4Smrg 2300bb88ba4Smrg mga: add stub storm functions if not using XAA 2310bb88ba4Smrg 2320bb88ba4Smrg If we aren't using XAA just add stub storm init/sync functions. 2330bb88ba4Smrg 2340bb88ba4Smrg This lets the driver load yay. 2350bb88ba4Smrg 2360bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2370bb88ba4Smrg 2380bb88ba4Smrgcommit 220e06fefe77175d9827954e61549eadda245d9a 2390bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com> 2400bb88ba4SmrgDate: Tue Sep 25 08:54:42 2012 -0400 2410bb88ba4Smrg 2420bb88ba4Smrg Remove mibstore.h 2430bb88ba4Smrg 2440bb88ba4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 2450bb88ba4Smrg 2460bb88ba4Smrgcommit cd41eacaeabf8227197d605b055713ca654633d5 2470bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2480bb88ba4SmrgDate: Tue Jul 17 16:05:09 2012 +1000 2490bb88ba4Smrg 2500bb88ba4Smrg xf86-video-mga: bump to version 1.6.1 2510bb88ba4Smrg 2520bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2530bb88ba4Smrg 2540bb88ba4Smrgcommit f11a407ceb0857bb0d33811511117b490a8ae6ee 2550bb88ba4SmrgAuthor: Dave Airlie <airlied@gmail.com> 2560bb88ba4SmrgDate: Sun Jul 15 19:41:28 2012 +1000 2570bb88ba4Smrg 2580bb88ba4Smrg mga: fix after XAA removal 2590bb88ba4Smrg 2600bb88ba4Smrg Fix mga build after XAA removal. 2610bb88ba4Smrg 2620bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2630bb88ba4Smrg 2640bb88ba4Smrgcommit fa0f3092ed38ce71ba9f65156bde306eb63feaf8 2650bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2660bb88ba4SmrgDate: Mon Jul 2 12:08:05 2012 +0100 2670bb88ba4Smrg 2680bb88ba4Smrg mga: bump to 1.6.0 2690bb88ba4Smrg 2700bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2710bb88ba4Smrg 2720bb88ba4Smrgcommit 7b6dcc4d5768cc8d17a1f664155ebdc8ca8c042e 2730bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 2740bb88ba4SmrgDate: Wed Jun 6 09:23:31 2012 +0100 2750bb88ba4Smrg 2760bb88ba4Smrg mga: port to new compat API. 2770bb88ba4Smrg 2780bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 2790bb88ba4Smrg 2800bb88ba4Smrgcommit 0cb8ba6dc5e7bf4179174f9f17e211df7d89bd41 2810bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2820bb88ba4SmrgDate: Wed May 23 23:40:32 2012 -0700 2830bb88ba4Smrg 2840bb88ba4Smrg Add const qualifier to char *from in MGAdoDDC 2850bb88ba4Smrg 2860bb88ba4Smrg Only used to store arguments to pass as printf %s strings to xf86DrvMsg 2870bb88ba4Smrg 2880bb88ba4Smrg Fixes gcc warnings: 2890bb88ba4Smrg mga_driver.c: In function 'MGAdoDDC': 2900bb88ba4Smrg mga_driver.c:1338:7: warning: assignment discards qualifiers from pointer target type 2910bb88ba4Smrg mga_driver.c:1343:11: warning: assignment discards qualifiers from pointer target type 2920bb88ba4Smrg mga_driver.c:1351:8: warning: assignment discards qualifiers from pointer target type 2930bb88ba4Smrg mga_driver.c:1359:8: warning: assignment discards qualifiers from pointer target type 2940bb88ba4Smrg 2950bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2960bb88ba4Smrg Reviewed-by: Dave Airlie <airlied@redhat.com> 2970bb88ba4Smrg 2980bb88ba4Smrgcommit 3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f 2990bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3000bb88ba4SmrgDate: Wed May 23 23:34:07 2012 -0700 3010bb88ba4Smrg 3020bb88ba4Smrg Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.h 3030bb88ba4Smrg 3040bb88ba4Smrg Silences deprecation warnings from xf86PciInfo.h in current Xorg servers 3050bb88ba4Smrg 3060bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3070bb88ba4Smrg Reviewed-by: Dave Airlie <airlied@redhat.com> 3080bb88ba4Smrg 3090bb88ba4Smrgcommit 0af7dba78559ce82b4c3eed0862415efcde51863 3100bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com> 3110bb88ba4SmrgDate: Thu May 17 10:19:21 2012 +0100 3120bb88ba4Smrg 3130bb88ba4Smrg mga: don't bind to device if there is a kernel driver 3140bb88ba4Smrg 3150bb88ba4Smrg this should only pick up KMS drivers and not old drm drivers. 3160bb88ba4Smrg 3170bb88ba4Smrg Signed-off-by: Dave Airlie <airlied@redhat.com> 3180bb88ba4Smrg 3190bb88ba4Smrgcommit 3991971c23ebe596742c004b1e583dfb1aa14ec4 3200bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3210bb88ba4SmrgDate: Fri Mar 23 19:02:40 2012 -0700 3220bb88ba4Smrg 3230bb88ba4Smrg xf86-video-mga 1.5.0 3240bb88ba4Smrg 3250bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3260bb88ba4Smrg 3270bb88ba4Smrgcommit 4c4beaf628c9c5dd531605e40696ed31db0e97b8 3280bb88ba4SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 3290bb88ba4SmrgDate: Wed Jan 4 15:15:07 2012 +1000 3300bb88ba4Smrg 3310bb88ba4Smrg Untangle XF86DRI from the driver-specific DRI define 3320bb88ba4Smrg 3330bb88ba4Smrg XF86DRI is defined by xorg-server.h, so --disable-dri in the driver 3340bb88ba4Smrg itself does exactly nothing other than not fill in the CFLAGS 3350bb88ba4Smrg and thus stop the driver from compiling. 3360bb88ba4Smrg 3370bb88ba4Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 3380bb88ba4Smrg 3390bb88ba4Smrgcommit 9223c44a731f48c66c226eb88dcb6f9d574cb599 3400bb88ba4SmrgAuthor: Julien Cristau <jcristau@debian.org> 3410bb88ba4SmrgDate: Tue Jan 3 23:35:18 2012 +0100 3420bb88ba4Smrg 3430bb88ba4Smrg When we can't load the xaa or exa modules, use shadowfb instead 3440bb88ba4Smrg 3450bb88ba4Smrg Signed-off-by: Julien Cristau <jcristau@debian.org> 3460bb88ba4Smrg 3470bb88ba4Smrgcommit cc9d2e808de20723c9035952242d966455d583b7 3480bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3490bb88ba4SmrgDate: Wed Dec 28 19:44:40 2011 -0800 3500bb88ba4Smrg 3510bb88ba4Smrg Check MGAAllocAdaptor() for memory allocation failure 3520bb88ba4Smrg 3530bb88ba4Smrg If it couldn't allocate memory, don't attempt to write a bunch of values 3540bb88ba4Smrg to the NULL pointer before returning it, but just pass the NULL along 3550bb88ba4Smrg right away. 3560bb88ba4Smrg 3570bb88ba4Smrg Resolves parfait warnings of the form: 3580bb88ba4Smrg 3590bb88ba4Smrg Error: Null pointer dereference (CWE 476) 3600bb88ba4Smrg Write to null pointer 'adapt' 3610bb88ba4Smrg at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'. 3620bb88ba4Smrg Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320. 3630bb88ba4Smrg Null pointer introduced at line 237 in function 'MGAAllocAdaptor'. 3640bb88ba4Smrg 3650bb88ba4Smrg repeated for every line writing to the adapt pointer in each function. 3660bb88ba4Smrg 3670bb88ba4Smrg [ This bug was found by the Parfait 0.4.2 bug checking tool. 3680bb88ba4Smrg For more information see http://labs.oracle.com/projects/parfait/ ] 3690bb88ba4Smrg 3700bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3710bb88ba4Smrg Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 3720bb88ba4Smrg 3730bb88ba4Smrgcommit 644ba5d11049e63ea61b5cc4fb889b0f840965ff 3740bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com> 3750bb88ba4SmrgDate: Wed Dec 7 15:42:39 2011 -0500 3760bb88ba4Smrg 3770bb88ba4Smrg Add support for Video Memory greater then 8M 3780bb88ba4Smrg 3790bb88ba4Smrg Expand memory mapping of framebuffer from 8 to 16MB 3800bb88ba4Smrg 3810bb88ba4Smrg Fix segfault on redhat distibution 3820bb88ba4Smrg 3830bb88ba4Smrg Signed-off-by: Christian Toutant <ctoutant@matrox.com> 3840bb88ba4Smrg 3850bb88ba4Smrgcommit d9cf07a4f424b2beb844ea1b3ec5d468e79a747c 3860bb88ba4SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 3870bb88ba4SmrgDate: Sat Oct 29 16:34:41 2011 -0700 3880bb88ba4Smrg 3890bb88ba4Smrg Include "xf86Modes.h" for xf86ModeBandwidth 3900bb88ba4Smrg 3910bb88ba4Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 3920bb88ba4Smrg 3930bb88ba4Smrgcommit f9acf37be49844bea8165be9786afe37fd999229 3940bb88ba4SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 3950bb88ba4SmrgDate: Sat Oct 29 16:31:08 2011 -0700 3960bb88ba4Smrg 3970bb88ba4Smrg Include <unistd.h> for usleep 3980bb88ba4Smrg 3990bb88ba4Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 4000bb88ba4Smrg 4010bb88ba4Smrgcommit 07792ef41f33aa5419168263637e34ee614f26e2 4020bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com> 4030bb88ba4SmrgDate: Mon Sep 26 22:38:17 2011 -0400 4040bb88ba4Smrg 4050bb88ba4Smrg Remove calls to xf86IsPc98() 4060bb88ba4Smrg 4070bb88ba4Smrg Reviewed-by: Jamey Sharp <jamey@minilop.net> 4080bb88ba4Smrg Signed-off-by: Matt Turner <mattst88@gmail.com> 4090bb88ba4Smrg 4100bb88ba4Smrgcommit 560967b4ffdb103f95121c43708dd5fc680a5045 4110bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com> 4120bb88ba4SmrgDate: Mon Sep 26 22:37:04 2011 -0400 4130bb88ba4Smrg 4140bb88ba4Smrg Fix printf format specifier warning 4150bb88ba4Smrg 4160bb88ba4Smrg Signed-off-by: Matt Turner <mattst88@gmail.com> 4170bb88ba4Smrg 4180bb88ba4Smrgcommit 1036e32e006d496023553ea566cb13ae93933719 4190bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com> 4200bb88ba4SmrgDate: Mon Sep 26 22:35:48 2011 -0400 4210bb88ba4Smrg 4220bb88ba4Smrg Remove if(E != NULL) checks around free(E) 4230bb88ba4Smrg 4240bb88ba4Smrg Reviewed-by: Jamey Sharp <jamey@minilop.net> 4250bb88ba4Smrg Signed-off-by: Matt Turner <mattst88@gmail.com> 4260bb88ba4Smrg 4270bb88ba4Smrgcommit ee09a9a340f8946f2d4a71a431b64189dbb5c256 4280bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com> 4290bb88ba4SmrgDate: Mon Sep 26 22:22:09 2011 -0400 4300bb88ba4Smrg 4310bb88ba4Smrg Remove xalloc/xcalloc/xrealloc/xfree 4320bb88ba4Smrg 4330bb88ba4Smrg Reviewed-by: Jamey Sharp <jamey@minilop.net> 4340bb88ba4Smrg Signed-off-by: Matt Turner <mattst88@gmail.com> 4350bb88ba4Smrg 4360bb88ba4Smrgcommit 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1 4370bb88ba4SmrgAuthor: Jamey Sharp <jamey@minilop.net> 4380bb88ba4SmrgDate: Thu Sep 15 10:29:11 2011 -0500 4390bb88ba4Smrg 4400bb88ba4Smrg Delete support for MGA's proprietary HAL: unifdef USEMGAHAL. 4410bb88ba4Smrg 4420bb88ba4Smrg This patch produced with: 4430bb88ba4Smrg for f in `git grep -Fwl USEMGAHAL`; do 4440bb88ba4Smrg unifdef -B -UUSEMGAHAL $f | sponge $f 4450bb88ba4Smrg done 4460bb88ba4Smrg 4470bb88ba4Smrg Adam Jackson wrote: 4480bb88ba4Smrg 4490bb88ba4Smrg Hey, so, remember back in the dark ages when dualhead was this 4500bb88ba4Smrg insanely wild differentiating feature? Matrox thought it was so 4510bb88ba4Smrg special, in fact, that they hid most of the implementation of it 4520bb88ba4Smrg (and a bunch of other stuff) in a binary-only blob called the 4530bb88ba4Smrg HALlib. As you'd expect it was pretty much a cut-and-paste of 4540bb88ba4Smrg the relevant Windows code, and then some open glue to keep it 4550bb88ba4Smrg working; clientlx.c is that glue. 4560bb88ba4Smrg 4570bb88ba4Smrg I guess the theory was that if you don't tell people which 4580bb88ba4Smrg registers to duplicate to implement a second pipe in their own 4590bb88ba4Smrg hardware, they won't figure it out? A pretty eyeroll-worthy 4600bb88ba4Smrg idea even at the time, and definitely not something we should be 4610bb88ba4Smrg condoning anymore. 4620bb88ba4Smrg 4630bb88ba4Smrg Kill it with fire, but while you're at it, untangle the hideous 4640bb88ba4Smrg mess of MGA_HAL() macros too. 4650bb88ba4Smrg 4660bb88ba4Smrg Signed-off-by: Jamey Sharp <jamey@minilop.net> 4670bb88ba4Smrg Cc: Adam Jackson <ajax@redhat.com> 4680bb88ba4Smrg 4690bb88ba4Smrgcommit ae90c47503bc1015a50e7ea6d22ec10e5e0d4113 4700bb88ba4SmrgAuthor: Jamey Sharp <jamey@minilop.net> 4710bb88ba4SmrgDate: Tue Sep 13 16:01:57 2011 -0500 4720bb88ba4Smrg 4730bb88ba4Smrg Nothing uses clientlx.c, so delete it. 4740bb88ba4Smrg 4750bb88ba4Smrg Adam Jackson wrote: 4760bb88ba4Smrg 4770bb88ba4Smrg Hey, so, remember back in the dark ages when dualhead was this 4780bb88ba4Smrg insanely wild differentiating feature? Matrox thought it was so 4790bb88ba4Smrg special, in fact, that they hid most of the implementation of it 4800bb88ba4Smrg (and a bunch of other stuff) in a binary-only blob called the 4810bb88ba4Smrg HALlib. As you'd expect it was pretty much a cut-and-paste of 4820bb88ba4Smrg the relevant Windows code, and then some open glue to keep it 4830bb88ba4Smrg working; clientlx.c is that glue. 4840bb88ba4Smrg 4850bb88ba4Smrg I guess the theory was that if you don't tell people which 4860bb88ba4Smrg registers to duplicate to implement a second pipe in their own 4870bb88ba4Smrg hardware, they won't figure it out? A pretty eyeroll-worthy 4880bb88ba4Smrg idea even at the time, and definitely not something we should be 4890bb88ba4Smrg condoning anymore. 4900bb88ba4Smrg 4910bb88ba4Smrg Kill it with fire ... 4920bb88ba4Smrg 4930bb88ba4Smrg Signed-off-by: Jamey Sharp <jamey@minilop.net> 4940bb88ba4Smrg Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> 4950bb88ba4Smrg Reviewed-by: Adam Jackson <ajax@redhat.com> 4960bb88ba4Smrg 4970bb88ba4Smrgcommit 01ca2186ea028b2549de509b51726aa08519fce0 4980bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com> 4990bb88ba4SmrgDate: Tue Sep 20 13:07:16 2011 -0400 5000bb88ba4Smrg 5010bb88ba4Smrg Reset tagfifo for renesas. 5020bb88ba4Smrg 5030bb88ba4Smrg For renesas, we need to reset tagfifo after a mode switch. 5040bb88ba4Smrg 5050bb88ba4Smrg Signed-off-by: Christian Toutant <ctoutant@matrox.com> 5060bb88ba4Smrg 5070bb88ba4Smrgcommit c083bf0a66bef9a4345847f39be5fb895c211f79 5080bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com> 5090bb88ba4SmrgDate: Wed Aug 3 09:45:13 2011 -0400 5100bb88ba4Smrg 5110bb88ba4Smrg Added support for G200SE Pilot3 5120bb88ba4Smrg 5130bb88ba4Smrg Optimize use of bandwidth and increase maximum resolution to 1920x1200 5140bb88ba4Smrg 5150bb88ba4Smrg Signed-off-by: Christian Toutant <ctoutant@matrox.com> 5160bb88ba4Smrg 5170bb88ba4Smrgcommit 43280e6521815582f219d42821d896093c9c0d5f 5180bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com> 5190bb88ba4SmrgDate: Wed Jun 22 17:02:29 2011 -0400 5200bb88ba4Smrg 5210bb88ba4Smrg Don't include xf86Priv.h 5220bb88ba4Smrg 5230bb88ba4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 5240bb88ba4Smrg 5250bb88ba4Smrgcommit 5f1b04e86e79938c8158055a777280a649f95510 5260bb88ba4SmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 5270bb88ba4SmrgDate: Fri Dec 17 09:00:46 2010 -0500 5280bb88ba4Smrg 5290bb88ba4Smrg added support for G200ER. 5300bb88ba4Smrg 5310bb88ba4Smrgcommit f7a2ef60e18e2cc464f69c1cad4681096c645651 5320bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 5330bb88ba4SmrgDate: Sat Oct 30 09:38:31 2010 -0700 5340bb88ba4Smrg 5350bb88ba4Smrg Sun's copyrights now belong to Oracle 5360bb88ba4Smrg 5370bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 5380bb88ba4Smrg 5390bb88ba4Smrgcommit 636c3c88e7e9cb30010fe1731cd7356849f3f172 5400bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com> 5410bb88ba4SmrgDate: Thu Oct 14 14:36:06 2010 -0400 5420bb88ba4Smrg 5430bb88ba4Smrg Don't allow the config file to override BIOS location 5440bb88ba4Smrg 5450bb88ba4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 5460bb88ba4Smrg 5470bb88ba4Smrgcommit 0bd44fad450843b7f1c35c70ab356a2b250d107d 5480bb88ba4SmrgAuthor: Jesse Adkins <jesserayadkins@gmail.com> 5490bb88ba4SmrgDate: Tue Sep 28 13:29:51 2010 -0700 5500bb88ba4Smrg 5510bb88ba4Smrg Purge cvs tags. 5520bb88ba4Smrg 5530bb88ba4Smrg Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> 5540bb88ba4Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 5550bb88ba4Smrg 5560bb88ba4Smrgcommit 951474c7fcd1b28d3178a6644d58958cb3bdf5a8 5570bb88ba4SmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 5580bb88ba4SmrgDate: Wed Aug 25 11:16:27 2010 -0400 5590bb88ba4Smrg 5600bb88ba4Smrg modified G200SE conditionnal statement about revision register for products compatibility. 5610bb88ba4Smrg 5620bb88ba4Smrgcommit c08b112bfe14fbfe713e4757eb0b704c8ed1f339 5630bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com> 5640bb88ba4SmrgDate: Tue Aug 10 10:58:41 2010 -0400 5650bb88ba4Smrg 5660bb88ba4Smrg xf86-video-mga 1.4.13 5670bb88ba4Smrg 5680bb88ba4Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 5690bb88ba4Smrg 570d7be9c72Smrgcommit 411570523550e1997bbd83815990bdda8cfd129c 571d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 572d7be9c72SmrgDate: Wed Jul 21 16:49:04 2010 -0400 573d7be9c72Smrg 574d7be9c72Smrg config: add comments for main statements 575d7be9c72Smrg 576d7be9c72Smrgcommit 99892c4f416e9669a62963d29e7dee760382da95 577d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 578d7be9c72SmrgDate: Wed Jul 21 16:07:00 2010 -0400 579d7be9c72Smrg 580d7be9c72Smrg config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES 581d7be9c72Smrg 582d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 583d7be9c72Smrg 584d7be9c72Smrgcommit 1f78a33e576898a0b7fd542f772064ad2f01e2f9 585d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 586d7be9c72SmrgDate: Wed Jul 21 14:37:41 2010 -0400 587d7be9c72Smrg 588d7be9c72Smrg config: replace deprecated AC_HELP_STRING with AS_HELP_STRING 589d7be9c72Smrg 590d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 591d7be9c72Smrg 592d7be9c72Smrgcommit fb311dc7e72a956c5a03e63757ec96b6626afb3a 593d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 594d7be9c72SmrgDate: Wed Jul 21 14:05:22 2010 -0400 595d7be9c72Smrg 596d7be9c72Smrg config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS 597d7be9c72Smrg 598d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 599d7be9c72Smrg 600d7be9c72Smrgcommit f2c386e5a7b9b5682db40d53e9f7b92e7d41ceba 601d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 602d7be9c72SmrgDate: Wed Jul 21 09:27:42 2010 -0400 603d7be9c72Smrg 604d7be9c72Smrg config: complete AC_INIT m4 quoting 605d7be9c72Smrg 606d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 607d7be9c72Smrg 608d7be9c72Smrgcommit 01d47165804c6c3a674fda7a9629e2f1d0f8b2db 609d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 610d7be9c72SmrgDate: Tue Jul 20 21:54:11 2010 -0400 611d7be9c72Smrg 612d7be9c72Smrg config: remove unrequired AC_SUBST([DRI_CFLAGS]) 613d7be9c72Smrg 614d7be9c72Smrg This macro is called by PKG_CHECK_MODULES 615d7be9c72Smrg 616d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 617d7be9c72Smrg 618d7be9c72Smrgcommit b84e08801f18292b3af73ac250788941fa2685a0 619d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 620d7be9c72SmrgDate: Tue Jul 20 21:44:57 2010 -0400 621d7be9c72Smrg 622d7be9c72Smrg config: remove unrequired AC_SUBST([XORG_CFLAGS]) 623d7be9c72Smrg 624d7be9c72Smrg This macro is called by PKG_CHECK_MODULES 625d7be9c72Smrg 626d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 627d7be9c72Smrg 628d7be9c72Smrgcommit 9d7ae5d171555c22c654b5ef14840f7c8c3d2124 629d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 630d7be9c72SmrgDate: Tue Jul 20 20:24:42 2010 -0400 631d7be9c72Smrg 632d7be9c72Smrg config: remove unrequired AC_HEADER_STDC 633d7be9c72Smrg 634d7be9c72Smrg Autoconf says: 635d7be9c72Smrg "This macro is obsolescent, as current systems have conforming 636d7be9c72Smrg header files. New programs need not use this macro". 637d7be9c72Smrg 638d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 639d7be9c72Smrg 640d7be9c72Smrgcommit ac6e0b60b18173598865a66333e0cfa383a61eec 641d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 642d7be9c72SmrgDate: Tue Jul 20 19:41:31 2010 -0400 643d7be9c72Smrg 644d7be9c72Smrg config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 645d7be9c72Smrg 646d7be9c72Smrg XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls 647d7be9c72Smrg AC_PROG_C_C99. This sets gcc with -std=gnu99. 648d7be9c72Smrg If AC_PROG_CC macro is called afterwards, it resets CC to gcc. 649d7be9c72Smrg 650d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 651d7be9c72Smrg 652d7be9c72Smrgcommit a84d4a8883c5c853396c644cbc6db0f7f838f6bf 653d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 654d7be9c72SmrgDate: Tue Jul 20 18:45:19 2010 -0400 655d7be9c72Smrg 656d7be9c72Smrg config: update AC_PREREQ statement to 2.60 657d7be9c72Smrg 658d7be9c72Smrg Unrelated to the previous patches, the new value simply reflects 659d7be9c72Smrg the reality that the minimum level for autoconf to configure 660d7be9c72Smrg all x.org modules is 2.60 dated June 2006. 661d7be9c72Smrg 662d7be9c72Smrg ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz 663d7be9c72Smrg 664d7be9c72Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 665d7be9c72Smrg 666d7be9c72Smrgcommit 3f28d8a8c0c1cf2885475ecd5cad0eb98313ce6f 667d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 668d7be9c72SmrgDate: Tue Jul 20 16:15:29 2010 -0400 669d7be9c72Smrg 670d7be9c72Smrg config: upgrade to util-macros 1.8 for additional man page support 671d7be9c72Smrg 672d7be9c72Smrg Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS 673d7be9c72Smrg The value of MAN_SUBST is the same for all X.Org packages. 674d7be9c72Smrg 675d7be9c72Smrgcommit 42d54a84a810c156c50b8f6643e4c8f315ed5f3e 676d7be9c72SmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 677d7be9c72SmrgDate: Thu Jul 22 10:51:15 2010 -0400 678d7be9c72Smrg 679d7be9c72Smrg adjusted max bandwith and max pitch values for G200SE 680d7be9c72Smrg 681d7be9c72Smrgcommit 306c46f6a627e51b051c55ce3d7ffc9a87d2e452 682d7be9c72SmrgAuthor: Adam Jackson <ajax@redhat.com> 683d7be9c72SmrgDate: Thu May 13 16:12:34 2010 -0400 684d7be9c72Smrg 685d7be9c72Smrg mga 1.4.12 686d7be9c72Smrg 687d7be9c72Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 688d7be9c72Smrg 689a31a186aSmrgcommit df6014303b6933ae7c4bcbe00762180dfd692598 690a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 691a31a186aSmrgDate: Wed Mar 24 10:05:09 2010 -0400 692a31a186aSmrg 693a31a186aSmrg Changed probe_size value to detect up to 16Megs of video ram on G200eV. 694a31a186aSmrg 695a31a186aSmrgcommit 3f215b64889bcc7a656fc36db1eed8276b401a95 696a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 697a31a186aSmrgDate: Thu Feb 11 11:37:36 2010 -0500 698a31a186aSmrg 699a31a186aSmrg Added support for G200EH 700a31a186aSmrg 701a31a186aSmrgcommit 9993ea7479d15daf7cca5aad55d51acd8c19fee1 702a31a186aSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 703a31a186aSmrgDate: Fri Jan 15 15:52:05 2010 -0800 704a31a186aSmrg 705a31a186aSmrg Update Sun license notices to current X.Org standard form 706a31a186aSmrg 707a31a186aSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 708a31a186aSmrg 709a31a186aSmrgcommit feed5306f48b8ebe4ed8be7d3ae63051ae972968 710a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 711a31a186aSmrgDate: Tue Dec 15 21:47:12 2009 -0500 712a31a186aSmrg 713a31a186aSmrg configure.ac: use backticks rather than $() for cmd subs 714a31a186aSmrg 715a31a186aSmrg Use "$PKG_CONFIG" rather than hard coded "pkg-config" 716a31a186aSmrg 717a31a186aSmrg Acked-by: Dan Nicholson <dbn.lists@gmail.com> 718a31a186aSmrg Acked-by: Daniel Stone <daniel@fooishbar.org> 719a31a186aSmrg 720a31a186aSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 721a31a186aSmrg 722a31a186aSmrgcommit 896e4e5a34ee20a289934f9fe42c888bd9bb140c 723a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 724a31a186aSmrgDate: Mon Nov 23 09:25:05 2009 -0500 725a31a186aSmrg 726a31a186aSmrg Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES 727a31a186aSmrg 728a31a186aSmrg Now that the INSTALL file is generated. 729a31a186aSmrg Allows running make maintainer-clean. 730a31a186aSmrg 731a31a186aSmrgcommit f0c388a26db5f24b9c3846b73a12197483b440ca 732a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 733a31a186aSmrgDate: Wed Oct 28 14:41:41 2009 -0400 734a31a186aSmrg 735a31a186aSmrg INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 736a31a186aSmrg 737a31a186aSmrg Automake 'foreign' option is specified in configure.ac. 738a31a186aSmrg Remove from Makefile.am 739a31a186aSmrg 740a31a186aSmrgcommit cd8434d86de8507e23405282acf80a9d02313134 741a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 742a31a186aSmrgDate: Wed Oct 28 14:09:09 2009 -0400 743a31a186aSmrg 744a31a186aSmrg INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 745a31a186aSmrg 746a31a186aSmrg Add missing INSTALL file. Use standard GNU file on building tarball 747a31a186aSmrg README may have been updated 748a31a186aSmrg Remove AUTHORS file as it is empty and no content available yet. 749a31a186aSmrg Remove NEWS file as it is empty and no content available yet. 750a31a186aSmrg 751a31a186aSmrgcommit 2dc2cca0da1d007ea4bc962f2a298df98560268a 752a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 753a31a186aSmrgDate: Mon Oct 26 12:54:21 2009 -0400 754a31a186aSmrg 755a31a186aSmrg Several driver modules do not have a ChangeLog target in Makefile.am #23814 756a31a186aSmrg 757a31a186aSmrg The git generated ChangeLog replaces the hand written one. 758a31a186aSmrg Update configure.ac to xorg-macros level 1.3. 759a31a186aSmrg Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros 760a31a186aSmrg Update Makefile.am to add ChangeLog target if missing 761a31a186aSmrg Remove ChangeLog from EXTRA_DIST or *CLEAN variables 762a31a186aSmrg This is a pre-req for the INSTALL_CMD 763a31a186aSmrg 764a31a186aSmrgcommit 7315b5a5b377810b8e11daf6b16e619f47cbde40 765a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 766a31a186aSmrgDate: Thu Oct 22 12:34:17 2009 -0400 767a31a186aSmrg 768a31a186aSmrg .gitignore: use common defaults with custom section # 24239 769a31a186aSmrg 770a31a186aSmrg Using common defaults will reduce errors and maintenance. 771a31a186aSmrg Only the very small or inexistent custom section need periodic maintenance 772a31a186aSmrg when the structure of the component changes. Do not edit defaults. 773a31a186aSmrg 774a31a186aSmrgcommit 5d4144e6c2912292c3552a45e4a0a3c127cad013 775a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 776a31a186aSmrgDate: Tue Nov 10 09:21:24 2009 -0500 777a31a186aSmrg 778a31a186aSmrg Removed DDC1 support for G200eW. 779a31a186aSmrg 780a31a186aSmrgcommit 860d42232f7fa18805334746e7e9415c4ae50aa3 781a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 782a31a186aSmrgDate: Wed Aug 19 11:01:39 2009 -0400 783a31a186aSmrg 784a31a186aSmrg updated G200eW PLL programming sequence. 785a31a186aSmrg 786a31a186aSmrgcommit 319bba2b759ec64287935e2fb16491f75a3169af 787a31a186aSmrgAuthor: Dave Airlie <airlied@redhat.com> 788a31a186aSmrgDate: Thu Jul 30 12:04:28 2009 +1000 789a31a186aSmrg 790a31a186aSmrg mga: bump for release 1.4.11 791a31a186aSmrg 792643b027fSmrgcommit e29477ef4d4ae50c39ef608ad0e2344c5c68ed40 793643b027fSmrgAuthor: Dave Airlie <airlied@redhat.com> 794643b027fSmrgDate: Tue Jul 28 15:22:40 2009 +1000 795643b027fSmrg 796643b027fSmrg mga: change to using ABI version check 797643b027fSmrg 798643b027fSmrgcommit 26ca92acc58b74202ec5eacaffc8e418d878da5e 799643b027fSmrgAuthor: Dave Airlie <airlied@redhat.com> 800643b027fSmrgDate: Tue Jul 28 13:32:31 2009 +1000 801643b027fSmrg 802643b027fSmrg mga: update for resources/RAC API removal 803643b027fSmrg 804643b027fSmrgcommit c1b8e89f367510958ffa8072ccbf416a13790c96 805643b027fSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 806643b027fSmrgDate: Thu Jul 9 13:09:42 2009 -0400 807643b027fSmrg 808643b027fSmrg xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611 809643b027fSmrg 810643b027fSmrg Adding the macro in configure.ac and use it in Makefile.am 811643b027fSmrg Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 812643b027fSmrg 813643b027fSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 814643b027fSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 815643b027fSmrg 816643b027fSmrgcommit 828b55d822f644976df40c8b835043895b7785e3 817643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com> 818643b027fSmrgDate: Thu May 28 15:06:19 2009 -0400 819643b027fSmrg 820643b027fSmrg Remove useless loader symbol lists. 821643b027fSmrg 822643b027fSmrgcommit afda628bf77d4c6d58de6f1b88a8fa5391f1df1a 823643b027fSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 824643b027fSmrgDate: Mon May 11 22:20:56 2009 -0700 825643b027fSmrg 826643b027fSmrg Fill in COPYING file, add SubmittingPatches URL to README 827643b027fSmrg 828643b027fSmrgcommit 2972b5707bbee5ac0d046b5100bcf572d82e1c4d 829643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com> 830643b027fSmrgDate: Wed May 6 14:12:35 2009 -0400 831643b027fSmrg 832643b027fSmrg Do E-EDID if built against a server that supports it. 833643b027fSmrg 834643b027fSmrgcommit b3fc1acaedd5d45b2c8eb2ba99b24579cf7d2a79 835643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com> 836643b027fSmrgDate: Wed May 6 13:02:36 2009 -0400 837643b027fSmrg 838643b027fSmrg Normalize DDC for the second head. 839643b027fSmrg 840643b027fSmrg The exit path wasn't symmetric with the exit path for the first head. 841643b027fSmrg 842643b027fSmrgcommit bf6aee62b891d4305cb96f8a37e625e5cf7c1504 843643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com> 844643b027fSmrgDate: Wed May 6 12:04:48 2009 -0400 845643b027fSmrg 846643b027fSmrg Remove redundant MGAuseI2C macro 847643b027fSmrg 848643b027fSmrgcommit 626af26098ab5d0823bf1d6c08157b4c89ec578a 849643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com> 850643b027fSmrgDate: Mon Apr 27 14:01:03 2009 -0400 851643b027fSmrg 852643b027fSmrg mga 1.4.10 853643b027fSmrg 854eda3803bSmrgcommit d33b06038223b2b121be7e3f8c207de5f518b28c 855eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 856eda3803bSmrgDate: Mon Apr 27 14:00:00 2009 -0400 857eda3803bSmrg 858eda3803bSmrg Fix ChangeLog generation 859eda3803bSmrg 860eda3803bSmrgcommit 06b6ead9a1b367e08ed6b3e75dfde0ee3b4a82b8 861eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 862eda3803bSmrgDate: Mon Apr 27 13:37:42 2009 -0400 863eda3803bSmrg 864eda3803bSmrg G200SE: Only force 16bpp on low-memory cards 865eda3803bSmrg 866eda3803bSmrgcommit 8b84fe236a42336e87048317880cc437494655f1 867eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 868eda3803bSmrgDate: Mon Apr 27 13:36:45 2009 -0400 869eda3803bSmrg 870eda3803bSmrg Move device ID and memory sizing much earlier in setup 871eda3803bSmrg 872eda3803bSmrgcommit 9a82c5db3f8332d10b31d68e5b86d3a6b136dc5e 873eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 874eda3803bSmrgDate: Mon Apr 27 13:26:03 2009 -0400 875eda3803bSmrg 876eda3803bSmrg Fix xf86ModeBandwidth check 877eda3803bSmrg 878eda3803bSmrgcommit 58888aefd0bad7bfca231ec7a54865d9c26c8095 879eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 880eda3803bSmrgDate: Mon Apr 27 13:19:42 2009 -0400 881eda3803bSmrg 882eda3803bSmrg Remove a leftover from overlay support 883eda3803bSmrg 884eda3803bSmrgcommit 19c44d537e982fcf0fe2dc9f3273ac6166302510 885eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 886eda3803bSmrgDate: Tue Apr 21 10:00:24 2009 -0400 887eda3803bSmrg 888eda3803bSmrg Fixed bad vga access in memory count routine. 889eda3803bSmrg 890eda3803bSmrgcommit 2388c4d512554258bce2b78c8f8aa1151b161c3e 891eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 892eda3803bSmrgDate: Tue Apr 21 09:51:34 2009 -0400 893eda3803bSmrg 894eda3803bSmrg Force pitch of 1024 for G200SE Pilot1 when edid is used as modeline. 895eda3803bSmrg 896eda3803bSmrgcommit 32bc0bcec815a363a47b9e7337d06370baf0c0d4 897eda3803bSmrgAuthor: Stefan Dirsch <sndirsch@suse.de> 898eda3803bSmrgDate: Thu Apr 16 15:34:12 2009 +0200 899eda3803bSmrg 900eda3803bSmrg Prevent MergedFB setups from crashing. 901eda3803bSmrg 902eda3803bSmrg Second time mga_read_and_process_bios() is called pMga->chip_attribs 903eda3803bSmrg is a NULL pointer for some reason. (#21022) 904eda3803bSmrg 905eda3803bSmrgcommit 70681daa0392e5fa413f888d92a30ddacdcc9c8c 906eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 907eda3803bSmrgDate: Tue Mar 31 11:41:00 2009 -0400 908eda3803bSmrg 909eda3803bSmrg Fixed G200SE PLL selection routine of m,n,p. 910eda3803bSmrg 911eda3803bSmrgcommit c955c1fdabfe0449369d0ccf31ab7e6ef3d7bffe 912eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 913eda3803bSmrgDate: Mon Mar 30 13:38:39 2009 -0400 914eda3803bSmrg 915eda3803bSmrg fixed memory count rountine for G200eW to detect up to 16Megs on X server without libpciaccess. 916eda3803bSmrg 917eda3803bSmrgcommit 16a5e3a7e13c0a2c1091ad452250cbc231b8f427 918eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 919eda3803bSmrgDate: Thu Mar 26 10:58:06 2009 -0400 920eda3803bSmrg 921eda3803bSmrg Modified memory count rountine for G200eW to detect up to 16Megs. 922eda3803bSmrg 923eda3803bSmrgcommit 36ae47b82310d96f158694765105fc010911702f 924eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 925eda3803bSmrgDate: Wed Mar 11 16:31:43 2009 -0400 926eda3803bSmrg 927eda3803bSmrg Fixed bad access issues and ddc1 implementation for IP core. 928eda3803bSmrg Fixed a bug in PLL programming sequence for G200eW/G200eV where a register IO offset was used instead of 929eda3803bSmrg a memory offset. 930eda3803bSmrg Removed clock selection toggling in PLL programming sequence for G200eW. 931eda3803bSmrg Fixed ddc1 protocol to support correct I/O lines according to chip attribute. 932eda3803bSmrg Fixed a bug in CRTC2 programming seqence where a register IO offset was used instead of a memory offset. 933eda3803bSmrg 934eda3803bSmrgcommit 669acb55023bce505f4a912bed6f1e9f3efa2856 935eda3803bSmrgAuthor: Thomas Jaeger <ThJaeger@gmail.com> 936eda3803bSmrgDate: Fri Jan 30 16:18:34 2009 -0500 937eda3803bSmrg 938eda3803bSmrg Fall back to software for unsupported repeat modes 939eda3803bSmrg 940eda3803bSmrg [anholt: dropped unneded ->repeat check -- it's a misguided compat field for 941eda3803bSmrg drivers from before repeatType existed] 942eda3803bSmrg 943eda3803bSmrgcommit 496342b09b7379bff95627ec357d4dd24123dc85 944eda3803bSmrgAuthor: Chris Ball <cjb@laptop.org> 945eda3803bSmrgDate: Fri Feb 27 10:54:17 2009 -0500 946eda3803bSmrg 947eda3803bSmrg Revert "Build fix for EXA 3" 948eda3803bSmrg 949eda3803bSmrg This reverts commit 4aac5618278d47a801bef40d3eede1c360c1ea28. 950eda3803bSmrg The EXA developers have backed out this ABI bump. 951eda3803bSmrg 952eda3803bSmrg Signed-off-by: Chris Ball <cjb@laptop.org> 953eda3803bSmrg 954eda3803bSmrgcommit 4aac5618278d47a801bef40d3eede1c360c1ea28 955eda3803bSmrgAuthor: Chris Ball <cjb@laptop.org> 956eda3803bSmrgDate: Tue Feb 24 12:48:54 2009 -0500 957eda3803bSmrg 958eda3803bSmrg Build fix for EXA 3 959eda3803bSmrg 960eda3803bSmrg EXA in xserver head now requires us to pass -DEXA_DRIVER_KNOWN_MAJOR=3. 961eda3803bSmrg 962eda3803bSmrg Signed-off-by: Chris Ball <cjb@laptop.org> 963eda3803bSmrg 964eda3803bSmrgcommit 0e9df5fe820d69387355c3ef857cde4cc72220b0 965eda3803bSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 966eda3803bSmrgDate: Fri Jan 30 20:41:56 2009 -0800 967eda3803bSmrg 968eda3803bSmrg Add README with pointers to mailing list, bugzilla & git repos 969eda3803bSmrg 970eda3803bSmrgcommit aa64a0c7b31858802f953b787991ef9c22a94cc5 971eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 972eda3803bSmrgDate: Wed Jan 21 09:56:41 2009 -0500 973eda3803bSmrg 974eda3803bSmrg Updated PLL algorithm for G200eW. 975eda3803bSmrg Changed the m,n,p selection for G200eW and programming sequence. 976eda3803bSmrg 977eda3803bSmrgcommit 808d887d910636aaa64c42d6add896e9f9b1833a 978eda3803bSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 979eda3803bSmrgDate: Fri Jan 9 16:30:43 2009 -0800 980eda3803bSmrg 981eda3803bSmrg Remove xorgconfig & xorgcfg from See Also list in man page 982eda3803bSmrg 983eda3803bSmrgcommit ba376973ae0d25557fdcd920e03474c0e6632e97 984eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 985eda3803bSmrgDate: Thu Nov 20 23:02:49 2008 -0500 986eda3803bSmrg 987eda3803bSmrg Fixed PLL m,n,p selection for G200eW to respect byte granularity. 988eda3803bSmrg Renamed G200 eW Winbond ID string to Nuvoton. 989eda3803bSmrg Added EV suffix to G200 Maxim. 990eda3803bSmrg Blocked double scan mode for G200 eW. 991eda3803bSmrg Fixed memory bandwidth limitation for G200eW to 318.77 Mhz. 992eda3803bSmrg Added a workaround (blit 1x1 with rop=xor) to fix the black screen problem for G200eW. 993eda3803bSmrg 994eda3803bSmrgcommit 01e60b391f39f2ebcf2eeb3be2424a2e291ec8ca 995eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com> 996eda3803bSmrgDate: Wed Oct 1 21:39:40 2008 -0400 997eda3803bSmrg 998eda3803bSmrg fixed winbond/nuvoton min pll clock to correct value (18.75Mhz). 999eda3803bSmrg 1000eda3803bSmrgcommit a0ebccaa10668bff6a51d9c027cd43e29a030e2b 1001eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1002eda3803bSmrgDate: Wed Jul 2 15:02:32 2008 -0400 1003eda3803bSmrg 1004eda3803bSmrg mga 1.4.9 1005eda3803bSmrg 1006eda3803bSmrgcommit 62c8f0ad5bb3dd23226a6b481ed4f260c6770f55 1007eda3803bSmrgAuthor: Yannick Henault <yheneaul@matrox.com> 1008eda3803bSmrgDate: Mon Jun 30 17:00:16 2008 -0400 1009eda3803bSmrg 1010eda3803bSmrg Bug #16545: Add G200WB support. 1011eda3803bSmrg 1012eda3803bSmrgcommit 32d50fca615af2c49914dd88c9da0f21b868b172 1013eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1014eda3803bSmrgDate: Mon Jun 23 13:06:21 2008 -0400 1015eda3803bSmrg 1016eda3803bSmrg Death to RCS tags. 1017eda3803bSmrg 1018eda3803bSmrgcommit 382659741681ad10290c1e01045dfe9e2fde8d3f 1019eda3803bSmrgAuthor: Yannick Henault <yheneaul@matrox.com> 1020eda3803bSmrgDate: Mon Jun 23 13:02:43 2008 -0400 1021eda3803bSmrg 1022eda3803bSmrg Bug #15836: Fix DDC on G200SE. 1023eda3803bSmrg 1024eda3803bSmrgcommit 9e2ee9403c198da5d79dfb2f4fcafe9b381afd3d 1025eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1026eda3803bSmrgDate: Mon Jun 9 11:36:46 2008 -0700 1027eda3803bSmrg 1028eda3803bSmrg G200EV: Enable support for G200EV 1029eda3803bSmrg 1030eda3803bSmrgcommit fd9732800687b96caa9f81c0cc4b24c6aad04e78 1031eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1032eda3803bSmrgDate: Fri May 30 19:47:10 2008 -0700 1033eda3803bSmrg 1034eda3803bSmrg I2C: Second (and final) round of clean-ups 1035eda3803bSmrg 1036eda3803bSmrgcommit c0711038ac2dcfb28dd4ead784c89615fb3b5844 1037eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1038eda3803bSmrgDate: Fri May 30 19:39:38 2008 -0700 1039eda3803bSmrg 1040eda3803bSmrg I2C: First round of clean-ups 1041eda3803bSmrg 1042eda3803bSmrgcommit 7e28ce7f26fba2acee879c1da41426490034c0a9 1043eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1044eda3803bSmrgDate: Fri May 30 18:43:27 2008 -0700 1045eda3803bSmrg 1046eda3803bSmrg Get memory probe size and stride (offset) values values from a data table instead of from code 1047eda3803bSmrg 1048eda3803bSmrgcommit 074a4aa1985219910a96b022368067e3ed5641e6 1049eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1050eda3803bSmrgDate: Fri May 30 18:23:59 2008 -0700 1051eda3803bSmrg 1052eda3803bSmrg Initialize default BIOS values from a data table instead of from code 1053eda3803bSmrg 1054eda3803bSmrgcommit 9ee7b04b1fe57834a541ef27b4e25acffd3ac1c5 1055eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com> 1056eda3803bSmrgDate: Fri May 30 17:51:22 2008 -0700 1057eda3803bSmrg 1058eda3803bSmrg cfb8_32: Gut a remnants of support for 24-bit with 8-bit overlay 1059eda3803bSmrg 1060eda3803bSmrgcommit 254299d06eba2ede820f1fe2929a4b247ead39b1 1061eda3803bSmrgAuthor: Tiago Vignatti <vignatti@c3sl.ufpr.br> 1062eda3803bSmrgDate: Wed May 7 01:07:44 2008 -0300 1063eda3803bSmrg 1064eda3803bSmrg For compatibility, accept SWcursor as option. 1065eda3803bSmrg 1066eda3803bSmrgcommit 0c61ccde7857dc7514881636144f95df51edaddf 1067eda3803bSmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com> 1068eda3803bSmrgDate: Fri Feb 1 00:15:27 2008 -0200 1069eda3803bSmrg 1070eda3803bSmrg Replace ALLOCATE_LOCAL/DEALLOCATE_LOCAL with xalloc/xfree. 1071eda3803bSmrg 1072eda3803bSmrg The other missing symbols is MGAGetClientPointer, that I believe 1073eda3803bSmrg should be provided by matrox's libHAL.a, that I am afraid if someone 1074eda3803bSmrg still has a copy of it, it won't work with X Org's loader. 1075eda3803bSmrg 1076eda3803bSmrgcommit dcad316efe93491fabfe558bcf5331cf0a9402a6 1077eda3803bSmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 1078eda3803bSmrgDate: Sat Mar 8 23:39:28 2008 +0100 1079eda3803bSmrg 1080eda3803bSmrg Makefile.am: nuke RCS Id 1081eda3803bSmrg 1082eda3803bSmrgcommit b5e43552f6b2a8ce8f405411a4ba6496e57d5100 1083eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1084eda3803bSmrgDate: Sat Jan 19 15:34:56 2008 -0500 1085eda3803bSmrg 1086eda3803bSmrg Disable I2C on G200SE for now. 1087eda3803bSmrg 1088eda3803bSmrgcommit cd2436c57d6b197ce0f58bf39ade903393cea842 1089eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1090eda3803bSmrgDate: Sat Jan 19 15:34:41 2008 -0500 1091eda3803bSmrg 1092eda3803bSmrg Change initial memory sizing on G200SE. 1093eda3803bSmrg 1094eda3803bSmrgcommit 40a4c1bdff174c31e6426a2ab3bc7cea5d99a700 1095eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1096eda3803bSmrgDate: Sat Jan 19 15:34:19 2008 -0500 1097eda3803bSmrg 1098eda3803bSmrg Adjust memory timings on G200SE-A. 1099eda3803bSmrg 1100eda3803bSmrg A bit opaque, but from the vendor: 1101eda3803bSmrg 1102eda3803bSmrg "The 0x1E24 check is to verify which pilot card is being used. And is used 1103eda3803bSmrg mainly to setup the hipri value of the card for use in a non hal enabled 1104eda3803bSmrg configuration as well as for when we check the max bandwidth for the latest 1105eda3803bSmrg board version of pilot." (fdo bug #11652) 1106eda3803bSmrg 1107eda3803bSmrgcommit d26b8d50a80b9408565f7daf0ad911bac5f44721 1108eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1109eda3803bSmrgDate: Sat Jan 19 15:33:49 2008 -0500 1110eda3803bSmrg 1111eda3803bSmrg Updates to memory sizing on G200SE. 1112eda3803bSmrg 1113eda3803bSmrgcommit e3777cafc07500c733b8569b50ce202e346c94bf 1114eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1115eda3803bSmrgDate: Sat Jan 19 15:33:28 2008 -0500 1116eda3803bSmrg 1117eda3803bSmrg No depth 15 on G200SE-A. 1118eda3803bSmrg 1119eda3803bSmrgcommit 6cd7677c41cf59194561225ed521a295e535862f 1120eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1121eda3803bSmrgDate: Sat Jan 19 15:33:13 2008 -0500 1122eda3803bSmrg 1123eda3803bSmrg Filter high-bandwidth modes on G200SE. 1124eda3803bSmrg 1125eda3803bSmrgcommit 15ba6d7b79308ff2da8abc9edf67ddc96d7d6b9f 1126eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com> 1127eda3803bSmrgDate: Sat Jan 19 15:32:53 2008 -0500 1128eda3803bSmrg 1129eda3803bSmrg Update PInS defaults for G200SE-A. 1130eda3803bSmrg 1131fe5e51b7Smrgcommit e50a99877b2870746266b799b0a6411b2214a3de 1132fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1133fe5e51b7SmrgDate: Fri Jan 18 19:31:40 2008 +0100 1134fe5e51b7Smrg 1135fe5e51b7Smrg Bumped version to 1.4.8. 1136fe5e51b7Smrg 1137fe5e51b7Smrgcommit bfee7bf011625079fd79b1bf89198ffeb76096d2 1138fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1139fe5e51b7SmrgDate: Fri Jan 18 18:05:49 2008 +0100 1140fe5e51b7Smrg 1141fe5e51b7Smrg Bug #13926: Unbreak Xinerama. 1142fe5e51b7Smrg 1143fe5e51b7Smrgcommit 2096022c0757b675d39dea8830125ba800b43160 1144fe5e51b7SmrgAuthor: Adam Jackson <ajax@redhat.com> 1145fe5e51b7SmrgDate: Wed Dec 12 18:10:52 2007 -0500 1146fe5e51b7Smrg 1147fe5e51b7Smrg G200SE-A can't cope with bigger than 1600x1200. 1148fe5e51b7Smrg 1149fe5e51b7Smrgcommit 81717e5780350665166dd7a0f4d96135609a8764 1150fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 1151fe5e51b7SmrgDate: Tue Oct 30 18:43:30 2007 -0700 1152fe5e51b7Smrg 1153fe5e51b7Smrg Don't build or call init_dri if XF86DRI is undefined 1154fe5e51b7Smrg 1155fe5e51b7Smrgcommit db22b6ef0fa3ae20f46719bd826e16b6580e5213 1156fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1157fe5e51b7SmrgDate: Wed Oct 3 23:06:48 2007 +0200 1158fe5e51b7Smrg 1159fe5e51b7Smrg Fixed a typo. 1160fe5e51b7Smrg 1161fe5e51b7Smrgcommit 8e971287f60f3a41f2d0d176e4eaaa653e25276b 1162fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1163fe5e51b7SmrgDate: Wed Oct 3 12:47:59 2007 -0700 1164fe5e51b7Smrg 1165fe5e51b7Smrg Unmap the same size that was mapped 1166fe5e51b7Smrg 1167fe5e51b7Smrg Make sure the same size is used with pci_device_unmap_range as was used with 1168fe5e51b7Smrg pci_device_map_range. Failing to do so was causing problems with a G450 1169fe5e51b7Smrg card in a POWER6 box. 1170fe5e51b7Smrg 1171fe5e51b7Smrg Based on a patch submitted by Anton Blanchard. 1172fe5e51b7Smrg 1173fe5e51b7Smrgcommit 10d452ad86b4798f3ded6c4c2446f08aaab6af00 1174fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1175fe5e51b7SmrgDate: Sat Sep 15 00:16:16 2007 +0200 1176fe5e51b7Smrg 1177fe5e51b7Smrg Oops, don't access the "memory" field in struct pci_mem_region either. 1178fe5e51b7Smrg 1179fe5e51b7Smrgcommit 485fb9aa1e5d90c75d763db4b7bf5a80e51e83e9 1180fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1181fe5e51b7SmrgDate: Fri Sep 14 23:10:09 2007 +0200 1182fe5e51b7Smrg 1183fe5e51b7Smrg Use pci_device_map_range() instead of pci_device_map_region(). 1184fe5e51b7Smrg 1185fe5e51b7Smrg Likewise for pci_device_unmap_region(). 1186fe5e51b7Smrg 1187fe5e51b7Smrgcommit d7f0f657504b2646a94f652baf0f71ff4117fac4 1188fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1189fe5e51b7SmrgDate: Wed Sep 5 18:06:57 2007 +0200 1190fe5e51b7Smrg 1191fe5e51b7Smrg Bumped version to 1.4.7. 1192fe5e51b7Smrg 1193fe5e51b7Smrgcommit 6fde3fd6d34e7252ee16422b19896d71b1622039 1194a31a186aSmrgMerge: 4bfc1e1 923176f 1195fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com> 1196fe5e51b7SmrgDate: Mon Sep 3 06:07:32 2007 -0400 1197fe5e51b7Smrg 1198fe5e51b7Smrg Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga 1199fe5e51b7Smrg 1200fe5e51b7Smrgcommit 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3 1201fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com> 1202fe5e51b7SmrgDate: Mon Sep 3 05:52:35 2007 -0400 1203fe5e51b7Smrg 1204fe5e51b7Smrg Add *~ to .gitignore to skip patch/emacs droppings 1205fe5e51b7Smrg 1206fe5e51b7Smrgcommit 923176f5aad777b4023003a457bb77da21373389 1207fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1208fe5e51b7SmrgDate: Fri Aug 31 11:05:57 2007 -0700 1209fe5e51b7Smrg 1210fe5e51b7Smrg Use XSERVER_LIBPCIACCESS to detect pci-rework. 1211fe5e51b7Smrg 1212fe5e51b7Smrgcommit 90beb8c27b4206b593898d346bf37ab49e75b975 1213fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1214fe5e51b7SmrgDate: Wed Aug 22 11:19:46 2007 -0700 1215fe5e51b7Smrg 1216fe5e51b7Smrg Set pScrn to NULL before calling xf86ConfigPciEntity. 1217fe5e51b7Smrg 1218fe5e51b7Smrg Why is the interface to xf86ConfigPciEntity so filled with hate? 1219fe5e51b7Smrg 1220fe5e51b7Smrgcommit 55d219394ad6af8e25ff604bcbb49d5a551bd348 1221fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1222fe5e51b7SmrgDate: Wed Aug 22 10:43:39 2007 -0700 1223fe5e51b7Smrg 1224fe5e51b7Smrg Merge PCI-rework support and "classic" PCI interface support into one tree 1225fe5e51b7Smrg 1226fe5e51b7Smrg First pass at merging both trees. So far, this has only been tested 1227fe5e51b7Smrg on the PCI-rework build on a PCI G450. 1228fe5e51b7Smrg 1229fe5e51b7Smrgcommit f4ef39d53d5a67942707507814fef4ad466dc909 1230fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1231fe5e51b7SmrgDate: Mon Aug 20 15:36:57 2007 -0700 1232fe5e51b7Smrg 1233fe5e51b7Smrg Fix compile error introduced by merge. 1234fe5e51b7Smrg 1235fe5e51b7Smrgcommit 707d3adbc7d9ee918d6c70083f51ad851ce68852 1236a31a186aSmrgMerge: 741c50c 489e007 1237fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1238fe5e51b7SmrgDate: Mon Aug 20 15:20:39 2007 -0700 1239fe5e51b7Smrg 1240fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 1241fe5e51b7Smrg 1242fe5e51b7Smrgcommit 489e007a29de63716ab550eacb3e98a91975d1d5 1243fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1244fe5e51b7SmrgDate: Wed Aug 8 21:32:57 2007 +0200 1245fe5e51b7Smrg 1246fe5e51b7Smrg Fixed major blending and compositing breakage. 1247fe5e51b7Smrg 1248fe5e51b7Smrg Do not adjust the destination blend factor if we need source alpha 1249fe5e51b7Smrg but our source doesn't have an alpha channel. This makes no sense at all, 1250fe5e51b7Smrg because the intermediate picture will always have alpha bits (either from 1251fe5e51b7Smrg the original source, or forced to 0xff). 1252fe5e51b7Smrg 1253fe5e51b7Smrgcommit 3820f55e3068163f8c3047a25126673e6de2d16e 1254fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1255fe5e51b7SmrgDate: Wed Aug 1 09:02:21 2007 -0700 1256fe5e51b7Smrg 1257fe5e51b7Smrg Add info for offset 116 in PInS version 5. 1258fe5e51b7Smrg 1259fe5e51b7Smrgcommit 7d7626f8429e108dd326899d927de4b4c79f71f5 1260fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1261fe5e51b7SmrgDate: Mon Jul 30 12:36:19 2007 +0200 1262fe5e51b7Smrg 1263fe5e51b7Smrg Bug #4249: Further increase the minimum dot clock. 1264fe5e51b7Smrg 1265fe5e51b7Smrgcommit 1a1fe837bc114b5f741e87f14bef74803e299c8d 1266fe5e51b7SmrgAuthor: Brice Goglin <Brice.Goglin@ens-lyon.org> 1267fe5e51b7SmrgDate: Fri Jul 27 18:19:21 2007 +0200 1268fe5e51b7Smrg 1269fe5e51b7Smrg Change minimal frequency guess from 12 to 16MHz 1270fe5e51b7Smrg 1271fe5e51b7Smrg G550 seems to lock up with frequencies below 16MHz. 1272fe5e51b7Smrg 1273fe5e51b7Smrg Reported by Benjamin Wong <hackerb9@u.washington.edu> in 1274fe5e51b7Smrg http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430112 1275fe5e51b7Smrg and https://bugs.freedesktop.org/show_bug.cgi?id=11339 1276fe5e51b7Smrg 1277fe5e51b7Smrgcommit 041caa230b91a017881394c59d76d663d647529c 1278fe5e51b7SmrgAuthor: Gabriele Gorla <gorlik@yahoo.com> 1279fe5e51b7SmrgDate: Thu Jul 19 22:14:51 2007 -0400 1280fe5e51b7Smrg 1281fe5e51b7Smrg Add Xv support for Millennium II chips 1282fe5e51b7Smrg 1283fe5e51b7Smrg Bug 11537 1284fe5e51b7Smrg 1285fe5e51b7Smrgcommit 7b080d993ceda7b181e0611ed0c997c8aecc9ad7 1286fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1287fe5e51b7SmrgDate: Sun Apr 15 12:47:27 2007 +0200 1288fe5e51b7Smrg 1289fe5e51b7Smrg Added memcpy-based DownloadFromScreen implementation. 1290fe5e51b7Smrg 1291fe5e51b7Smrgcommit 43b79af51b600e98ecac9d57aeb0d686dbc6a50e 1292fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1293fe5e51b7SmrgDate: Sun Apr 15 12:41:01 2007 +0200 1294fe5e51b7Smrg 1295fe5e51b7Smrg On G550, do A8 adds in hardware. 1296fe5e51b7Smrg 1297fe5e51b7Smrgcommit 69c4ed205afbeb9ad937f079caace6cee19bd7b1 1298fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1299fe5e51b7SmrgDate: Sun Apr 15 12:28:28 2007 +0200 1300fe5e51b7Smrg 1301fe5e51b7Smrg Make DRI initialization work when using EXA. 1302fe5e51b7Smrg 1303fe5e51b7Smrg Still need to implement InitBuffers and MoveBuffers for EXA. 1304fe5e51b7Smrg 1305fe5e51b7Smrgcommit 920b84364a374ac8cde9314efc6742c11a72ce4f 1306fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1307fe5e51b7SmrgDate: Fri Mar 30 20:47:14 2007 +0200 1308fe5e51b7Smrg 1309fe5e51b7Smrg Removed the debug messages for solid and copy ops. 1310fe5e51b7Smrg 1311fe5e51b7Smrgcommit d1696d91d9da79c40b0576b3ce754dc8a6666117 1312fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1313fe5e51b7SmrgDate: Fri Mar 30 20:45:45 2007 +0200 1314fe5e51b7Smrg 1315fe5e51b7Smrg Sync after UploadToScreen. 1316fe5e51b7Smrg 1317fe5e51b7Smrgcommit 1246f724bfdd44b49091516bf909ecf97c9b82db 1318fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 1319fe5e51b7SmrgDate: Wed Mar 28 11:14:24 2007 -0400 1320fe5e51b7Smrg 1321fe5e51b7Smrg Default mode on G200SE of 1024x768 @ 16bpp. 1322fe5e51b7Smrg 1323fe5e51b7Smrg The poor thing has so little VRAM that you can't do any bigger than 640x480 1324fe5e51b7Smrg at 32bpp, so in the interest of having a reasonable screen size... 1325fe5e51b7Smrg 1326fe5e51b7Smrgcommit 834bdfc2503f64d8f3bff088dc5eaf8f52f828f5 1327fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 1328fe5e51b7SmrgDate: Wed Mar 28 11:09:56 2007 -0400 1329fe5e51b7Smrg 1330fe5e51b7Smrg Disable MTRR support for PCIE G200SE cards, as it tickles hardware bugs. 1331fe5e51b7Smrg 1332fe5e51b7Smrgcommit 630390dc5b892941ed6609ca5c35b90be53333f7 1333fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 1334fe5e51b7SmrgDate: Wed Mar 28 11:07:49 2007 -0400 1335fe5e51b7Smrg 1336fe5e51b7Smrg Fix various timing bugs on the G200SE. 1337fe5e51b7Smrg 1338fe5e51b7Smrgcommit 99430f1cf36c07350cdc557dbbb5c0a34c9b9dd0 1339fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1340fe5e51b7SmrgDate: Sun Mar 18 12:41:06 2007 +0100 1341fe5e51b7Smrg 1342fe5e51b7Smrg Shut up the compiler. 1343fe5e51b7Smrg 1344fe5e51b7Smrgcommit 741c50c162986a14647301c2c5f8e080a7664efd 1345fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1346fe5e51b7SmrgDate: Fri Feb 2 15:50:14 2007 -0800 1347fe5e51b7Smrg 1348fe5e51b7Smrg Code refactoring in MGAScreenInit. 1349fe5e51b7Smrg 1350fe5e51b7Smrg Rearrange code so that functions that are selected based on MergedFB 1351fe5e51b7Smrg and SecondCrtc are selected in one place instead of 3. Rearrange some 1352fe5e51b7Smrg code that selects on FBDev and Primary to flow a little better. 1353fe5e51b7Smrg 1354fe5e51b7Smrgcommit 4432091b2597cf4bba09009622d247c0d8ff151f 1355fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1356fe5e51b7SmrgDate: Thu Feb 1 13:45:18 2007 -0800 1357fe5e51b7Smrg 1358fe5e51b7Smrg Ensure the result of MGAMapMem is checked. 1359fe5e51b7Smrg 1360fe5e51b7Smrg Add GCC warn_unused_result attribute to MGAMapMem. Add a check of the 1361fe5e51b7Smrg return value to one place that was missing it (in MGACountRam), and 1362fe5e51b7Smrg check the return of that function. 1363fe5e51b7Smrg 1364fe5e51b7Smrgcommit 3a47132af4dfab420e3c35d7d100dd93fb7bf9c6 1365fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1366fe5e51b7SmrgDate: Thu Feb 1 13:30:34 2007 -0800 1367fe5e51b7Smrg 1368fe5e51b7Smrg Refactor memory map / unmap functions. 1369fe5e51b7Smrg 1370fe5e51b7Smrg MGAMapMem and MGAMapMemFBDev were refactored into a single function. 1371fe5e51b7Smrg This happens to fix a bug triggered in software XAA paths because 1372fe5e51b7Smrg MGAMapMem did not set FbStart. MGAUnmapMem and MGAUnmapMemFBDev were 1373fe5e51b7Smrg also refactored into a single function. 1374fe5e51b7Smrg 1375fe5e51b7Smrgcommit 916d41bcf99bbf666bf634edb1c72b90d9b16ea0 1376fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1377fe5e51b7SmrgDate: Mon Jan 15 11:42:52 2007 -0800 1378fe5e51b7Smrg 1379fe5e51b7Smrg Convert to new pci_device_cfg_write_u* interface. 1380fe5e51b7Smrg 1381fe5e51b7Smrgcommit b26bfefb7ea107be3949daea0f6beca6d80c09d4 1382fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1383fe5e51b7SmrgDate: Mon Jan 15 11:42:07 2007 -0800 1384fe5e51b7Smrg 1385fe5e51b7Smrg Pass the correct pointer to pci_device_cfg_write_bits. 1386fe5e51b7Smrg 1387fe5e51b7Smrgcommit d5b4dbe749e860e4349607c57467f8085dc28c33 1388a31a186aSmrgMerge: cb103a1 876657e 1389fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1390fe5e51b7SmrgDate: Tue Jan 9 16:04:06 2007 -0800 1391fe5e51b7Smrg 1392fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 1393fe5e51b7Smrg 1394fe5e51b7Smrgcommit 876657e613de6d9dd906c95e05fc590a84d1c322 1395fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1396fe5e51b7SmrgDate: Tue Dec 26 22:14:57 2006 +0100 1397fe5e51b7Smrg 1398fe5e51b7Smrg Fixed a typo that caused MGAREG_C2OFFSET to be set to a bad value. 1399fe5e51b7Smrg 1400fe5e51b7Smrg Unfortunately, this doesn't fix any bugs because afterwards, 1401fe5e51b7Smrg the correct value would be stored in MGAREG_C2OFFSET anyway. 1402fe5e51b7Smrg 1403fe5e51b7Smrgcommit 7d676a830a9b0c5593e144e15a14dc4aa6bc5ab7 1404fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1405fe5e51b7SmrgDate: Tue Dec 26 19:45:18 2006 +0100 1406fe5e51b7Smrg 1407fe5e51b7Smrg More boring janitoring work. 1408fe5e51b7Smrg 1409fe5e51b7Smrgcommit 787284f420d324821ac31b43f3d915d58533a141 1410fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1411fe5e51b7SmrgDate: Tue Dec 26 00:30:51 2006 +0100 1412fe5e51b7Smrg 1413fe5e51b7Smrg Fixed a typo in a debug message. 1414fe5e51b7Smrg 1415fe5e51b7Smrgcommit 373bf108414cebdaea8d3febc9120566ef5e4118 1416fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1417fe5e51b7SmrgDate: Tue Dec 26 00:28:55 2006 +0100 1418fe5e51b7Smrg 1419fe5e51b7Smrg Bug #9448: Actually write the C2STARTADD0 register. 1420fe5e51b7Smrg 1421fe5e51b7Smrgcommit fd91b601ec4dd48cfb6ea5495b595fec6d932ab5 1422a31a186aSmrgMerge: f84b138 0ce8f52 1423fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1424fe5e51b7SmrgDate: Sun Dec 24 06:32:53 2006 +0200 1425fe5e51b7Smrg 1426fe5e51b7Smrg Merge branch 'temp' 1427fe5e51b7Smrg 1428fe5e51b7Smrgcommit 0ce8f522a207dd0fa21ebf41b82f6af930cd7e54 1429fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1430fe5e51b7SmrgDate: Sun Dec 24 06:24:56 2006 +0200 1431fe5e51b7Smrg 1432fe5e51b7Smrg bump to 1.4.6.1 (respin) 1433fe5e51b7Smrg No code changes, just built with a better util-macros. 1434fe5e51b7Smrg 1435fe5e51b7Smrgcommit 74d21b74774c81d3d96ff3017763c25e3660dde0 1436fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1437fe5e51b7SmrgDate: Sun Dec 24 06:23:43 2006 +0200 1438fe5e51b7Smrg 1439fe5e51b7Smrg bump to 1.4.6 1440fe5e51b7Smrg 1441fe5e51b7Smrgcommit f84b13871114e6bb486402e00186a319df123f53 1442fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1443fe5e51b7SmrgDate: Sun Dec 24 06:23:19 2006 +0200 1444fe5e51b7Smrg 1445fe5e51b7Smrg bump to 1.4.6.1 1446fe5e51b7Smrg 1447fe5e51b7Smrgcommit 9b2e1381ccda8bb4f4d186c20d5672738adfc04b 1448fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1449fe5e51b7SmrgDate: Sat Dec 16 01:44:49 2006 +0200 1450fe5e51b7Smrg 1451fe5e51b7Smrg bump to 1.4.6 1452fe5e51b7Smrg 1453fe5e51b7Smrgcommit cb103a18067adb3256c0b791255ce8435ff57e06 1454a31a186aSmrgMerge: d0e0362 4bcfca9 1455fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1456fe5e51b7SmrgDate: Mon Dec 11 15:06:19 2006 -0800 1457fe5e51b7Smrg 1458fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 1459fe5e51b7Smrg 1460fe5e51b7Smrgcommit d0e03622811fd94c830c0b5233ff505392c0d331 1461a31a186aSmrgMerge: 8fee907 1dd6e69 1462fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1463fe5e51b7SmrgDate: Mon Dec 11 15:06:03 2006 -0800 1464fe5e51b7Smrg 1465fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 1466fe5e51b7Smrg 1467fe5e51b7Smrg Conflicts: 1468fe5e51b7Smrg 1469fe5e51b7Smrg src/mga_macros.h 1470fe5e51b7Smrg 1471fe5e51b7Smrgcommit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412 1472fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1473fe5e51b7SmrgDate: Sun Dec 10 14:33:10 2006 +0100 1474fe5e51b7Smrg 1475fe5e51b7Smrg Replaced some more magic values with register names. 1476fe5e51b7Smrg 1477fe5e51b7Smrgcommit 55d283a8c2347e809dadace3fb9a026bab6d57dd 1478fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1479fe5e51b7SmrgDate: Wed Dec 6 18:46:00 2006 +0200 1480fe5e51b7Smrg 1481fe5e51b7Smrg Makefile.am: fix ChangeLog hook 1482fe5e51b7Smrg Make ChangeLog hook safe for all situations I could think of, including 1483fe5e51b7Smrg carrying the ChangeLog through for distcheck when objdir != srcdir. It's 1484fe5e51b7Smrg significantly more ugly, but eh. 1485fe5e51b7Smrg 1486fe5e51b7Smrgcommit fbbbb853041ae4af36eeffb24188b9a5513ba7d5 1487fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1488fe5e51b7SmrgDate: Sat Dec 2 12:42:34 2006 +0100 1489fe5e51b7Smrg 1490fe5e51b7Smrg Removed a duplicated register definition. 1491fe5e51b7Smrg 1492fe5e51b7Smrgcommit 447aae84d07cab34987ab08ead9319e176ccd904 1493fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1494fe5e51b7SmrgDate: Fri Dec 1 20:19:13 2006 +0100 1495fe5e51b7Smrg 1496fe5e51b7Smrg More janitoring work. 1497fe5e51b7Smrg 1498fe5e51b7Smrg Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions 1499fe5e51b7Smrg to mga_reg.h. 1500fe5e51b7Smrg Cleaned up the DAC2 routing. 1501fe5e51b7Smrg 1502fe5e51b7Smrgcommit 10b2202c254b71b8d0da987a225d5e78a030bca4 1503fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1504fe5e51b7SmrgDate: Fri Dec 1 19:10:55 2006 +0100 1505fe5e51b7Smrg 1506fe5e51b7Smrg Use the XORG_RELEASE_VERSION autoconf macro. 1507fe5e51b7Smrg 1508fe5e51b7Smrgcommit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a 1509fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1510fe5e51b7SmrgDate: Thu Nov 30 19:59:38 2006 +0200 1511fe5e51b7Smrg 1512fe5e51b7Smrg bump to 1.4.5 1513fe5e51b7Smrg 1514fe5e51b7Smrgcommit 5bbafd77678a2b0f82e820aa98337a014d284554 1515fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1516fe5e51b7SmrgDate: Sun Nov 26 18:06:12 2006 +0100 1517fe5e51b7Smrg 1518fe5e51b7Smrg Made some XAA function static. 1519fe5e51b7Smrg 1520fe5e51b7Smrgcommit 4778901bb13a950285c55ea6f058e94ee7b03652 1521fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1522fe5e51b7SmrgDate: Sun Nov 26 16:21:34 2006 +0100 1523fe5e51b7Smrg 1524fe5e51b7Smrg Removed a duplicated register definition. 1525fe5e51b7Smrg 1526fe5e51b7Smrgcommit f9d83ad601c8cba197e96f0b907f1dae6134953b 1527fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1528fe5e51b7SmrgDate: Sun Nov 26 16:17:12 2006 +0100 1529fe5e51b7Smrg 1530fe5e51b7Smrg Replaced more magic values with register names. 1531fe5e51b7Smrg 1532fe5e51b7Smrgcommit 6df85941ce077e1eee8b43945c51ab1b0906c758 1533fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1534fe5e51b7SmrgDate: Sun Nov 26 15:39:54 2006 +0100 1535fe5e51b7Smrg 1536fe5e51b7Smrg Use register names in MGASaveScreenMerged() rather than magic numbers. 1537fe5e51b7Smrg 1538fe5e51b7Smrgcommit b3ee69f6ac058e52d5175f611090baa76eed49f9 1539fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1540fe5e51b7SmrgDate: Sun Nov 26 15:24:46 2006 +0100 1541fe5e51b7Smrg 1542fe5e51b7Smrg Register name tweak. 1543fe5e51b7Smrg 1544fe5e51b7Smrg The "DAC power down" register powers down the DAC when it's 1545fe5e51b7Smrg set to zero, and enables it when it's set to one. 1546fe5e51b7Smrg To avoid confusion, I renamed it. 1547fe5e51b7Smrg 1548fe5e51b7Smrgcommit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528 1549fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1550fe5e51b7SmrgDate: Sat Nov 25 17:08:15 2006 +0100 1551fe5e51b7Smrg 1552fe5e51b7Smrg Removed some unused defines from mga_reg.h. 1553fe5e51b7Smrg 1554fe5e51b7Smrgcommit 334c7237078652722d7dec1c74812af46bfd7c67 1555fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1556fe5e51b7SmrgDate: Sat Nov 25 16:42:49 2006 +0100 1557fe5e51b7Smrg 1558fe5e51b7Smrg Removed some duplicated register definitions. 1559fe5e51b7Smrg 1560fe5e51b7Smrgcommit be88d58968c604624617f40820dc9a50a92661be 1561fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1562fe5e51b7SmrgDate: Sun Nov 19 21:04:01 2006 +0100 1563fe5e51b7Smrg 1564fe5e51b7Smrg Bug #2168: Fix graphics corruptions with Mystique rev 2. 1565fe5e51b7Smrg 1566fe5e51b7Smrgcommit daeecb63567fb394654c9e66d64c3c53658f2c7d 1567fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1568fe5e51b7SmrgDate: Fri Nov 17 23:08:25 2006 +0100 1569fe5e51b7Smrg 1570fe5e51b7Smrg Enabled the Exa composite hooks on G550. 1571fe5e51b7Smrg 1572fe5e51b7Smrgcommit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a 1573fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org> 1574fe5e51b7SmrgDate: Mon Nov 6 23:58:06 2006 -0500 1575fe5e51b7Smrg 1576fe5e51b7Smrg Minor typofix that was causing configure to exit with a syntax error 1577fe5e51b7Smrg 1578fe5e51b7Smrgcommit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d 1579fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1580fe5e51b7SmrgDate: Fri Oct 27 11:53:40 2006 -0700 1581fe5e51b7Smrg 1582fe5e51b7Smrg Bump version to 1.4.4. 1583fe5e51b7Smrg 1584fe5e51b7Smrgcommit 19d950e61b2b33052e52c33add8e70c29ac9d766 1585fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1586fe5e51b7SmrgDate: Fri Oct 27 11:48:35 2006 -0700 1587fe5e51b7Smrg 1588fe5e51b7Smrg Convert tests of pMga->Chipset to tests of single bit flags. 1589fe5e51b7Smrg 1590fe5e51b7Smrg Several places in the driver contain if-statements that test Chipset against 1591fe5e51b7Smrg several different values to determine what functionality to use. Some of 1592fe5e51b7Smrg these tests, HALCHIPSETS in particular, test as many as 6 different values. 1593fe5e51b7Smrg This bloats the code size unnecessarilly. Instead we cache the results of 1594fe5e51b7Smrg some of those tests in single bit flags stored in pMga. 1595fe5e51b7Smrg 1596fe5e51b7Smrg These changes are similar to some changes in the pci-rework branch. 1597fe5e51b7Smrg 1598fe5e51b7Smrgcommit d28c4a3307984b86e0f3cc68fa48cdc01e307a7c 1599fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1600fe5e51b7SmrgDate: Thu Oct 26 19:52:54 2006 -0700 1601fe5e51b7Smrg 1602fe5e51b7Smrg Fix bug #8666. git-bisect for the win! 1603fe5e51b7Smrg 1604fe5e51b7Smrg Since && takes precedence over ||, put parenthesis around the || block to 1605fe5e51b7Smrg make all the operations associate in the intended manner. 1606fe5e51b7Smrg 1607fe5e51b7Smrgcommit 041910d3b9f6284b4b8a7df10f284528a7e79d12 1608fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 1609fe5e51b7SmrgDate: Fri Oct 13 18:33:39 2006 -0400 1610fe5e51b7Smrg 1611fe5e51b7Smrg Bump to 1.4.3 1612fe5e51b7Smrg 1613fe5e51b7Smrgcommit 8fee907cac7e5924630e3648bfb72ad9bd021ea8 1614a31a186aSmrgMerge: 7cecee1 2fc0ebf 1615fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1616fe5e51b7SmrgDate: Tue Oct 10 11:43:52 2006 -0700 1617fe5e51b7Smrg 1618fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 1619fe5e51b7Smrg 1620fe5e51b7Smrgcommit 2fc0ebfbe850c138e840b6653ed1476623aa04a4 1621fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1622fe5e51b7SmrgDate: Thu Sep 28 18:39:20 2006 +0200 1623fe5e51b7Smrg 1624fe5e51b7Smrg Make the DUALSTAGE0 code slightly easier to read. 1625fe5e51b7Smrg 1626fe5e51b7Smrgcommit ddd93ae96c5427d4c8d03eb225b66a1a93fa2bc8 1627fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org> 1628fe5e51b7SmrgDate: Wed Sep 20 20:42:12 2006 -0400 1629fe5e51b7Smrg 1630fe5e51b7Smrg Minor manpage typofixes. Patch by A. Costa (see Debian bug #364558) 1631fe5e51b7Smrg 1632fe5e51b7Smrgcommit 34ec93796e4be31d95d1ed507660c65a2c60fa43 1633fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1634fe5e51b7SmrgDate: Wed Sep 20 21:05:16 2006 +0200 1635fe5e51b7Smrg 1636fe5e51b7Smrg Unbreak the build: MGAStormSync() is required by mga_dga.c. 1637fe5e51b7Smrg 1638fe5e51b7Smrgcommit 954c8d06f2697d4f764583dd3336b4cc266b90fd 1639fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1640fe5e51b7SmrgDate: Wed Sep 20 20:51:36 2006 +0200 1641fe5e51b7Smrg 1642fe5e51b7Smrg Removed the XAA atype tables. 1643fe5e51b7Smrg 1644fe5e51b7Smrg Added a FIXME on BLK support for GXcopy instead. 1645fe5e51b7Smrg 1646fe5e51b7Smrgcommit ecc155e27b6566196e56de241ae81266e03dc90e 1647a31a186aSmrgMerge: e7b36c6 2e73c29 1648fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1649fe5e51b7SmrgDate: Wed Sep 20 20:43:55 2006 +0200 1650fe5e51b7Smrg 1651fe5e51b7Smrg Merge branch 'exa' 1652fe5e51b7Smrg 1653fe5e51b7Smrgcommit 2e73c2989e6cf0f24f8b0c4ae372f0c44dc19755 1654fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1655fe5e51b7SmrgDate: Wed Sep 20 20:41:18 2006 +0200 1656fe5e51b7Smrg 1657fe5e51b7Smrg Documented the AccelMethod option (copied from Radeon's man page). 1658fe5e51b7Smrg 1659fe5e51b7Smrgcommit 3f4c12a388af05995273c9abe742f82f84e558a8 1660fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1661fe5e51b7SmrgDate: Wed Sep 20 20:36:18 2006 +0200 1662fe5e51b7Smrg 1663fe5e51b7Smrg Removed the DFS stub. 1664fe5e51b7Smrg 1665fe5e51b7Smrgcommit 69cc0060d9516d5fba5fa46607a993f3ebfd5d89 1666fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1667fe5e51b7SmrgDate: Wed Sep 20 20:26:37 2006 +0200 1668fe5e51b7Smrg 1669fe5e51b7Smrg Fall back to software rendering for A8 add A8. 1670fe5e51b7Smrg 1671fe5e51b7Smrgcommit e7b36c66852077ffbbffdd20e39ed4b6f24541b7 1672fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 1673fe5e51b7SmrgDate: Mon Sep 18 11:08:51 2006 -0700 1674fe5e51b7Smrg 1675fe5e51b7Smrg Bump version to 1.4.2. Bump required server version to 1.1.0 (X.org 7.1) 1676fe5e51b7Smrg from pre-1.1.0 version. 1677fe5e51b7Smrg 1678fe5e51b7Smrgcommit 5830edf81a0c0119bd2486b48e56fdb9daf72586 1679fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1680fe5e51b7SmrgDate: Sat Sep 16 23:59:32 2006 +0200 1681fe5e51b7Smrg 1682fe5e51b7Smrg Generate ChangeLog from git. 1683fe5e51b7Smrg 1684fe5e51b7Smrgcommit 3b2a7b1faf142d4301c55b8951657e177b5ac118 1685fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1686fe5e51b7SmrgDate: Sat Sep 16 23:06:36 2006 +0200 1687fe5e51b7Smrg 1688fe5e51b7Smrg Don't install stormdwg. 1689fe5e51b7Smrg 1690fe5e51b7Smrgcommit 3d7c109c4864f021590c3bcf0f09685498225dde 1691fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1692fe5e51b7SmrgDate: Sat Sep 16 22:31:02 2006 +0200 1693fe5e51b7Smrg 1694fe5e51b7Smrg Enable the BYPASS332 and NODITHER flags when writing to 8 bpp dests. 1695fe5e51b7Smrg 1696fe5e51b7Smrg Thanks to Ville Syrjälä, who noticed these were missing. 1697fe5e51b7Smrg Note that this messes up glyph compositing (A8 add A8) pretty much, but 1698fe5e51b7Smrg I don't know what's really going on there yet. 1699fe5e51b7Smrg 1700fe5e51b7Smrgcommit 2eae7c98fcd3f452f9b9c2eef4a9cf820edf69aa 1701fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1702fe5e51b7SmrgDate: Fri Sep 15 16:01:28 2006 +0200 1703fe5e51b7Smrg 1704fe5e51b7Smrg More DUALSTAGE0 fixes related to A8 writes. 1705fe5e51b7Smrg 1706fe5e51b7Smrg When writing from a texture without an alpha channel to an A8 texture, 1707fe5e51b7Smrg we now set the alpha channel to 0xff via FCOL. 1708fe5e51b7Smrg 1709fe5e51b7Smrgcommit b1031689212bfbbe832dd73337ea8cd5d66ae2ff 1710fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1711fe5e51b7SmrgDate: Fri Sep 15 13:43:55 2006 +0200 1712fe5e51b7Smrg 1713fe5e51b7Smrg Reworked DUALSTAGE0 setup. 1714fe5e51b7Smrg 1715fe5e51b7Smrg If we're copying from A8 to A8, we need to replicate the alpha to 1716fe5e51b7Smrg the color channels. 1717fe5e51b7Smrg 1718fe5e51b7Smrgcommit 965faa3661f73a1d4cbf6368458244dff45a76ad 1719fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1720fe5e51b7SmrgDate: Wed Sep 13 14:56:29 2006 +0200 1721fe5e51b7Smrg 1722fe5e51b7Smrg Only use the source texture's alpha channel if it actually has one. 1723fe5e51b7Smrg 1724fe5e51b7Smrgcommit 14202e7c47326e8678bf38a6bda63d608f1f152b 1725fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1726fe5e51b7SmrgDate: Mon Sep 11 14:22:24 2006 +0200 1727fe5e51b7Smrg 1728fe5e51b7Smrg Support masks without alpha. 1729fe5e51b7Smrg 1730fe5e51b7Smrgcommit 35651deb8fc3b8b7b0cf4895732f2edeecdabeb7 1731fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1732fe5e51b7SmrgDate: Sun Sep 10 00:56:10 2006 +0200 1733fe5e51b7Smrg 1734fe5e51b7Smrg Fixed the remaining MGAAllocateMemory() issues. 1735fe5e51b7Smrg 1736fe5e51b7Smrgcommit d5e9270acf2f914fe7603225ac605cd29830bed6 1737fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1738fe5e51b7SmrgDate: Sun Sep 10 00:04:48 2006 +0200 1739fe5e51b7Smrg 1740fe5e51b7Smrg Fixed the engine sync needed for TexturedVideo. 1741fe5e51b7Smrg 1742fe5e51b7Smrgcommit 7739a929100d516e06646a38062df8da1f33f774 1743fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1744fe5e51b7SmrgDate: Sun Sep 10 00:04:21 2006 +0200 1745fe5e51b7Smrg 1746fe5e51b7Smrg The XAA path in MGA_SYNC() now only syncs the engine if NeedToSync is set. 1747fe5e51b7Smrg 1748fe5e51b7Smrg This makes both paths behave the same way. 1749fe5e51b7Smrg 1750fe5e51b7Smrgcommit 1a045b37db4c7c606ed056addf52d337dbdeb88d 1751fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1752fe5e51b7SmrgDate: Sat Sep 9 23:58:42 2006 +0200 1753fe5e51b7Smrg 1754fe5e51b7Smrg Dont't multiply the retval of MGAAllocateMemory() by cpp again. 1755fe5e51b7Smrg 1756fe5e51b7Smrgcommit dfa5807c1f5694728aa92138eb0eab5bd5b8c3d7 1757fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1758fe5e51b7SmrgDate: Sat Sep 9 13:24:01 2006 +0200 1759fe5e51b7Smrg 1760fe5e51b7Smrg Make use of MGA_MARK_SYNC. 1761fe5e51b7Smrg 1762fe5e51b7Smrgcommit bfb329542377e8e8141c87ed30389de6d7180e06 1763fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1764fe5e51b7SmrgDate: Sat Sep 9 13:20:13 2006 +0200 1765fe5e51b7Smrg 1766fe5e51b7Smrg XV works with EXA now (dumb port of the Radeon code). 1767fe5e51b7Smrg 1768fe5e51b7Smrgcommit 9fa71aef67df48b59f9d70fddd2725f739d171a9 1769fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 1770fe5e51b7SmrgDate: Sat Sep 9 11:58:32 2006 +0200 1771fe5e51b7Smrg 1772fe5e51b7Smrg Do A8->A8 ops in hardware. 1773fe5e51b7Smrg 1774fe5e51b7Smrgcommit 7a7feb251b8172786755ab81b154bbfb7d193dbc 1775fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 1776fe5e51b7SmrgDate: Sat Sep 9 01:16:26 2006 +0200 1777fe5e51b7Smrg 1778fe5e51b7Smrg PrepareSourceTexture() cannot fail. 1779fe5e51b7Smrg 1780fe5e51b7Smrgcommit c2545d6e94964fc981746cdf212b5dc9cd4fdd1b 1781fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)> 1782fe5e51b7SmrgDate: Sat Sep 9 01:14:38 2006 +0200 1783fe5e51b7Smrg 1784fe5e51b7Smrg Implemented pseudo-DMA based UTS. 1785fe5e51b7Smrg 1786fe5e51b7Smrgcommit 3969fe1176da9e39b722982889a3cccc0f812e59 1787fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1788fe5e51b7SmrgDate: Thu Sep 7 22:52:26 2006 +0200 1789fe5e51b7Smrg 1790fe5e51b7Smrg Refactored that texture format lookup code into mgaGetTexFormat(). 1791fe5e51b7Smrg 1792fe5e51b7Smrgcommit ad57c370ba8ffcbf0b7cf404c61ed01bc924ddd5 1793fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1794fe5e51b7SmrgDate: Thu Sep 7 22:21:19 2006 +0200 1795fe5e51b7Smrg 1796fe5e51b7Smrg Use the right dithering mode for r5g5b5 textures. 1797fe5e51b7Smrg 1798fe5e51b7Smrg This makes all of rendercheck's blend tests work. 1799fe5e51b7Smrg 1800fe5e51b7Smrgcommit c39749d6e0e967cd12bcc629c3840905e07dd60c 1801fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1802fe5e51b7SmrgDate: Thu Sep 7 18:24:08 2006 +0200 1803fe5e51b7Smrg 1804fe5e51b7Smrg Enable composite hooks on G400/G450 only. 1805fe5e51b7Smrg 1806fe5e51b7Smrg The PCI-IDs aren't ordered, so using ">=" there was totally broken. 1807fe5e51b7Smrg I don't know whether the code works on G550 either, so I'm not enabling 1808fe5e51b7Smrg it on these cards yet. 1809fe5e51b7Smrg 1810fe5e51b7Smrgcommit 0ee922bb4cce012c980c5d6178fe04e86c5cce53 1811fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1812fe5e51b7SmrgDate: Thu Sep 7 17:36:23 2006 +0200 1813fe5e51b7Smrg 1814fe5e51b7Smrg Code cleanup/formatting fixes. 1815fe5e51b7Smrg 1816fe5e51b7Smrgcommit 4ed932caa27df8c6a4c58478d3f9b45815de06f5 1817fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1818fe5e51b7SmrgDate: Thu Sep 7 17:21:52 2006 +0200 1819fe5e51b7Smrg 1820fe5e51b7Smrg Moved some FIXMEs. 1821fe5e51b7Smrg 1822fe5e51b7Smrgcommit 3b06475096238b3adc3151f27a92d7a8dbbb0231 1823fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1824fe5e51b7SmrgDate: Thu Sep 7 17:16:35 2006 +0200 1825fe5e51b7Smrg 1826fe5e51b7Smrg Put my name in mga_exa.c 1827fe5e51b7Smrg 1828fe5e51b7Smrgcommit 6391a058b333de306c9b11c6a723cb4457e76c8f 1829fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1830fe5e51b7SmrgDate: Wed Sep 6 16:43:51 2006 +0200 1831fe5e51b7Smrg 1832fe5e51b7Smrg Fixed the non-EXA build. 1833fe5e51b7Smrg 1834fe5e51b7Smrgcommit 74e85b19e564927337f23f6de25bb58f309e892b 1835fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1836fe5e51b7SmrgDate: Wed Sep 6 15:38:39 2006 +0200 1837fe5e51b7Smrg 1838fe5e51b7Smrg Enabled alpha filtering. 1839fe5e51b7Smrg 1840fe5e51b7Smrg This doesn't influence rendercheck's test outcome, but helps with 1841fe5e51b7Smrg evas_xrender_x11_test. 1842fe5e51b7Smrg 1843fe5e51b7Smrgcommit c2490640b4b237239872c5acbde3704e6e1412e9 1844fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1845fe5e51b7SmrgDate: Wed Sep 6 14:36:38 2006 +0200 1846fe5e51b7Smrg 1847fe5e51b7Smrg Code cleanup/formatting fixes. 1848fe5e51b7Smrg 1849fe5e51b7Smrgcommit 646a9927b8412b0224e260be46162782e87bf7c4 1850fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1851fe5e51b7SmrgDate: Wed Sep 6 14:24:26 2006 +0200 1852fe5e51b7Smrg 1853fe5e51b7Smrg Don't set TAMASK in TEXCTL. 1854fe5e51b7Smrg 1855fe5e51b7Smrg According to the specs this disables alpha transparency, which we 1856fe5e51b7Smrg probably don't want, but the tests say it's good. 1857fe5e51b7Smrg 1858fe5e51b7Smrgcommit e7eccaba96e5bc4ff3ddde49b5245cd448bd5d9b 1859fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1860fe5e51b7SmrgDate: Wed Sep 6 11:48:16 2006 +0200 1861fe5e51b7Smrg 1862fe5e51b7Smrg Rendering to (A)BGR isn't supported. 1863fe5e51b7Smrg 1864fe5e51b7Smrgcommit 72338321331fe8830d1d95a1c7f4a4fb5f2d9b0a 1865fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1866fe5e51b7SmrgDate: Wed Sep 6 10:57:13 2006 +0200 1867fe5e51b7Smrg 1868fe5e51b7Smrg Disabled color keying. 1869fe5e51b7Smrg 1870fe5e51b7Smrgcommit 056915493981be3f3b9270334e0f992a290dfab6 1871fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1872fe5e51b7SmrgDate: Mon Aug 28 22:19:23 2006 +0200 1873fe5e51b7Smrg 1874fe5e51b7Smrg Make this code a little more readable. 1875fe5e51b7Smrg 1876fe5e51b7Smrgcommit b8320d198abe0cd26b2f76b9add634ef8245ba27 1877fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1878fe5e51b7SmrgDate: Sun Aug 27 16:22:50 2006 +0200 1879fe5e51b7Smrg 1880fe5e51b7Smrg Minor code cleanup. 1881fe5e51b7Smrg 1882fe5e51b7Smrgcommit c525a7e73ac2ef18933d170f8497351d62e5b1ce 1883fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1884fe5e51b7SmrgDate: Sun Aug 27 15:22:58 2006 +0200 1885fe5e51b7Smrg 1886fe5e51b7Smrg Fixed a typo. 1887fe5e51b7Smrg 1888fe5e51b7Smrgcommit e0f76b32992274faa0adb39dfd6df0fc3b434e96 1889fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1890fe5e51b7SmrgDate: Sun Aug 27 12:44:16 2006 +0200 1891fe5e51b7Smrg 1892fe5e51b7Smrg Documented the mgaBlendOp array. 1893fe5e51b7Smrg 1894fe5e51b7Smrgcommit 5982e8200270d25a57da8ab0d1a8290cfaec070c 1895fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1896fe5e51b7SmrgDate: Sun Aug 27 12:27:59 2006 +0200 1897fe5e51b7Smrg 1898fe5e51b7Smrg Cleaned up the XAA code a bit. 1899fe5e51b7Smrg 1900fe5e51b7Smrgcommit e7ba7c993f4e439672810ec9ce3a24df823051a4 1901fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1902fe5e51b7SmrgDate: Sat Aug 26 22:33:25 2006 +0200 1903fe5e51b7Smrg 1904fe5e51b7Smrg Enable composite hooks on G400 or greater. 1905fe5e51b7Smrg 1906fe5e51b7Smrgcommit 6c365757891c3e0e0a55c7bea995ef8a4fb3f69c 1907fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1908fe5e51b7SmrgDate: Sat Aug 26 22:32:25 2006 +0200 1909fe5e51b7Smrg 1910fe5e51b7Smrg Added missing mgaSetup() call to the PrepareComposite hook. 1911fe5e51b7Smrg 1912fe5e51b7Smrgcommit 2efbc687fcc0d05dca241e4079d9236d9cce0dde 1913fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1914fe5e51b7SmrgDate: Sat Aug 26 22:27:34 2006 +0200 1915fe5e51b7Smrg 1916fe5e51b7Smrg Added a couple of missing newlines. 1917fe5e51b7Smrg 1918fe5e51b7Smrgcommit 17153c794d532f27a4248c3f64eba95ede62be87 1919fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1920fe5e51b7SmrgDate: Sat Aug 26 21:42:41 2006 +0200 1921fe5e51b7Smrg 1922fe5e51b7Smrg The texture mapping opcode is 6, not 5. 1923fe5e51b7Smrg 1924fe5e51b7Smrgcommit 13f649c65784192c30c18581d8795f3c47060644 1925fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1926fe5e51b7SmrgDate: Sat Aug 26 20:03:36 2006 +0200 1927fe5e51b7Smrg 1928fe5e51b7Smrg Removed ajax' comments on the Copy code, it seems to work well. 1929fe5e51b7Smrg 1930fe5e51b7Smrgcommit 4bf16b5f26266132f0c3e9c058df8014d52d56f1 1931fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1932fe5e51b7SmrgDate: Sat Aug 26 18:04:08 2006 +0200 1933fe5e51b7Smrg 1934fe5e51b7Smrg Clean up color/planemask replicating. 1935fe5e51b7Smrg 1936fe5e51b7Smrgcommit 5d001aeb21aabde5b6cd919692de726ebaeb3481 1937fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1938fe5e51b7SmrgDate: Sat Aug 26 18:00:49 2006 +0200 1939fe5e51b7Smrg 1940fe5e51b7Smrg Fixed alignment values (taken from kdrive). 1941fe5e51b7Smrg 1942fe5e51b7Smrgcommit 693f165e2c6c431e6c61c835781883c2bcef5876 1943fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1944fe5e51b7SmrgDate: Fri Aug 25 22:40:17 2006 +0200 1945fe5e51b7Smrg 1946fe5e51b7Smrg Fixed corruption on copy, by copying kdrive's waitmarker code. 1947fe5e51b7Smrg 1948fe5e51b7Smrgcommit 7fbd85b3621f5368ebce178e5e55b0cbd5a80733 1949fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1950fe5e51b7SmrgDate: Fri Aug 25 22:33:06 2006 +0200 1951fe5e51b7Smrg 1952fe5e51b7Smrg MGASelectBuffer() is only need for XAA. 1953fe5e51b7Smrg 1954fe5e51b7Smrgcommit 9b24934be499fe5de9fdc02a71e41906c50791d9 1955fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1956fe5e51b7SmrgDate: Thu Aug 10 22:01:19 2006 +0200 1957fe5e51b7Smrg 1958fe5e51b7Smrg Switched the MACCESS code to the stuff from mga_storm.c. 1959fe5e51b7Smrg 1960fe5e51b7Smrgcommit 398447c041cffdc712a86f9fe9b58c3f5189c86e 1961fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1962fe5e51b7SmrgDate: Thu Aug 10 21:31:49 2006 +0200 1963fe5e51b7Smrg 1964fe5e51b7Smrg Call exaMarkSync() where we'd set the NeedToSync flag for XAA. 1965fe5e51b7Smrg 1966fe5e51b7Smrgcommit b1126b4ab81c12f178fb7366a52b6f2d38af3810 1967fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1968fe5e51b7SmrgDate: Thu Aug 10 21:25:48 2006 +0200 1969fe5e51b7Smrg 1970fe5e51b7Smrg Removed XAA specific code from MGAGetQuiescence. 1971fe5e51b7Smrg 1972fe5e51b7Smrgcommit 9141effdbbcd2b3419874ebb4e3898fca3474417 1973fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1974fe5e51b7SmrgDate: Thu Aug 10 20:42:56 2006 +0200 1975fe5e51b7Smrg 1976fe5e51b7Smrg Added another chunk of kdrive code to mgaPrepareSolid(). 1977fe5e51b7Smrg 1978fe5e51b7Smrgcommit 3f440e499b5d0b073118855fe39fa4077971c06e 1979fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1980fe5e51b7SmrgDate: Thu Aug 10 20:40:51 2006 +0200 1981fe5e51b7Smrg 1982fe5e51b7Smrg Added mgaSetup() from kdrive code. 1983fe5e51b7Smrg 1984fe5e51b7Smrgcommit 9285dec527a5f0ec21384b1e079a3878b622a6c2 1985fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1986fe5e51b7SmrgDate: Thu Aug 10 20:03:18 2006 +0200 1987fe5e51b7Smrg 1988fe5e51b7Smrg Disable composite hooks for now, to reduce breakage. 1989fe5e51b7Smrg 1990fe5e51b7Smrgcommit db87a5ac8feca5f0126c7af4c51f69222fae7dd9 1991fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1992fe5e51b7SmrgDate: Thu Aug 10 20:02:51 2006 +0200 1993fe5e51b7Smrg 1994fe5e51b7Smrg Wait until the DMA engine is idle in mgaWaitMarker. 1995fe5e51b7Smrg 1996fe5e51b7Smrgcommit 84ec0db961de3b10ac02ec5ae6adcec5cc439069 1997fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1998fe5e51b7SmrgDate: Thu Aug 10 19:49:22 2006 +0200 1999fe5e51b7Smrg 2000fe5e51b7Smrg Initial commit of the Exa bits. 2001fe5e51b7Smrg 2002fe5e51b7Smrg Based on ajax' mga-exa-2.patch with some straight forward fixes 2003fe5e51b7Smrg by myself. 2004fe5e51b7Smrg 2005fe5e51b7Smrgcommit 7cecee186c889902bed9b7fa042f0bd3cc0297ef 2006a31a186aSmrgMerge: 160b1f7 bde5920 2007fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 2008fe5e51b7SmrgDate: Thu Aug 10 10:19:55 2006 -0700 2009fe5e51b7Smrg 2010fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 2011fe5e51b7Smrg 2012fe5e51b7Smrgcommit bde592047cd62194d7ef67520a9fdbaf269a8b90 2013fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2014fe5e51b7SmrgDate: Wed Aug 9 21:59:42 2006 +0200 2015fe5e51b7Smrg 2016fe5e51b7Smrg Bug #7265: Fix MGA DRI locking. 2017fe5e51b7Smrg 2018fe5e51b7Smrg The server expects the driver to take the DRI lock in the wakeup 2019fe5e51b7Smrg handler, and release it in the block handler. 2020fe5e51b7Smrg The old locking scheme didn't work like this, which caused problems. 2021fe5e51b7Smrg We now no longer override wakeup/block handler and just use the ones 2022fe5e51b7Smrg provided by the server. This means the DRI lock will be taken 2023fe5e51b7Smrg "all the time" and not just when it's needed by the driver. 2024fe5e51b7Smrg MGADRISwapContext* are activated again, so the wakeup handler could be 2025fe5e51b7Smrg removed. 2026fe5e51b7Smrg I didn't notice any DRI performance drop, but I didn't do serious 2027fe5e51b7Smrg benchmarking either. 2028fe5e51b7Smrg 2029fe5e51b7Smrgcommit 160b1f79fab7266a24b7d1a680cdf29bad9707c1 2030fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 2031fe5e51b7SmrgDate: Tue Aug 8 16:59:15 2006 -0700 2032fe5e51b7Smrg 2033fe5e51b7Smrg Store the pci_device pointer passed into MGAPciProbe instead of 2034fe5e51b7Smrg searching for it in MGAPreInit. 2035fe5e51b7Smrg 2036fe5e51b7Smrgcommit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68 2037a31a186aSmrgMerge: 95e0722 7170de8 2038fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 2039fe5e51b7SmrgDate: Wed Jul 26 11:47:32 2006 -0700 2040fe5e51b7Smrg 2041fe5e51b7Smrg Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework 2042fe5e51b7Smrg 2043fe5e51b7Smrgcommit 95e0722ff2e8878cdd6bb0e349eecab042b879db 2044fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)> 2045fe5e51b7SmrgDate: Wed Jul 26 11:46:52 2006 -0700 2046fe5e51b7Smrg 2047fe5e51b7Smrg Current state of MGA driver modified to work with the xserver 2048fe5e51b7Smrg pci-rework branch. 2049fe5e51b7Smrg 2050fe5e51b7Smrgcommit 7170de83762660efebff79be84f763008466ffa7 2051fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2052fe5e51b7SmrgDate: Wed Jul 26 17:06:18 2006 +0200 2053fe5e51b7Smrg 2054fe5e51b7Smrg Merged the various .cvsignores into .gitignore 2055fe5e51b7Smrg 2056fe5e51b7Smrgcommit 80bf41170af91b62b9950a5cf7baf3c364a8f539 2057fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2058fe5e51b7SmrgDate: Tue Jul 25 22:03:22 2006 +0200 2059fe5e51b7Smrg 2060fe5e51b7Smrg Fixed some warnings 2061fe5e51b7Smrg 2062fe5e51b7Smrgcommit 78c12368fa1c1985f41ce856ff453a967429870a 2063fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 2064fe5e51b7SmrgDate: Mon Jul 10 18:53:05 2006 -0700 2065fe5e51b7Smrg 2066fe5e51b7Smrg Add includes of <unistd.h> & <stdlib.h> to replace previously xf86wrapped prototypes 2067fe5e51b7Smrg 2068fe5e51b7Smrg Fixes these warnings: 2069fe5e51b7Smrg make.out:"mga_dacG.c", line 195: warning: implicit function declaration: abs 2070fe5e51b7Smrg make.out:"mga_dacG.c", line 1117: warning: implicit function declaration: usleepmake.out:"mga_driver.c", line 692: warning: implicit function declaration: usleep 2071fe5e51b7Smrg 2072fe5e51b7Smrgcommit c0dfac86e75ea63ae0c25c070bc661b6f41d35eb 2073fe5e51b7SmrgAuthor: Peter Breitenlohner <peb@mppmu.mpg.de> 2074fe5e51b7SmrgDate: Mon Jul 10 17:21:25 2006 -0700 2075fe5e51b7Smrg 2076fe5e51b7Smrg Bug #7369: mga(4) manpage typo mutilates part of text 2077fe5e51b7Smrg 2078fe5e51b7Smrg Bugzilla #7369: <https://bugs.freedesktop.org/show_bug.cgi?id=7369> 2079fe5e51b7Smrg Patch #6079: <https://bugs.freedesktop.org/attachment.cgi?id=6079> 2080fe5e51b7Smrg 2081fe5e51b7Smrgcommit fe23ada5cc8c13fa30aa210df9968a4042593ea2 2082fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2083fe5e51b7SmrgDate: Wed Jun 14 21:52:21 2006 +0000 2084fe5e51b7Smrg 2085fe5e51b7Smrg Refactor AccelFlags setting and some other feature settings for various MGA 2086fe5e51b7Smrg hardware. Eventually AccelFlags will be set from a table look-up, but 2087fe5e51b7Smrg that will come after the PCI rework is merged. 2088fe5e51b7Smrg 2089fe5e51b7Smrgcommit 72667a14fa330ef3b08dd72ab84ff09b164ff5ed 2090fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2091fe5e51b7SmrgDate: Wed Apr 12 20:26:35 2006 +0000 2092fe5e51b7Smrg 2093fe5e51b7Smrg Bug #6562: s/MAXSHORT/SHRT_MAX/ for POSIX. (Matthieu Herrb) 2094fe5e51b7Smrg 2095fe5e51b7Smrgcommit f0a3923fe65abb04e64e3159b154f677e76423ca 2096fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2097fe5e51b7SmrgDate: Sat Apr 8 01:33:58 2006 +0000 2098fe5e51b7Smrg 2099fe5e51b7Smrg Bump to 1.4.1 for Xv changes. 2100fe5e51b7Smrg 2101fe5e51b7Smrgcommit ae30dfebbd6883f1a863d193d6c8e971c0dec92b 2102fe5e51b7SmrgAuthor: Aaron Plattner <aplattner@nvidia.com> 2103fe5e51b7SmrgDate: Fri Apr 7 23:09:17 2006 +0000 2104fe5e51b7Smrg 2105fe5e51b7Smrg Add a DrawablePtr argument to the XV functions to pave the way for 2106fe5e51b7Smrg redirected video. 2107fe5e51b7Smrg 2108fe5e51b7Smrgcommit 8bc544169adfed95b11062fe9816ecf31e35b014 2109fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2110fe5e51b7SmrgDate: Fri Apr 7 19:21:13 2006 +0000 2111fe5e51b7Smrg 2112fe5e51b7Smrg Unlibcwrap. Bump server version requirement. Bump to 1.4.0. 2113fe5e51b7Smrg 2114fe5e51b7Smrgcommit 07373669514b104a11fb1b4ed5214f3764c83a2f 2115fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2116fe5e51b7SmrgDate: Sun Apr 2 01:03:50 2006 +0000 2117fe5e51b7Smrg 2118fe5e51b7Smrg Bug #6328: Add support for Matrox G200SE chips. (Matrox) 2119fe5e51b7Smrg 2120fe5e51b7Smrgcommit 88ece3c37c4ed529686b6cdea1bf9b6eed8fceea 2121fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2122fe5e51b7SmrgDate: Mon Mar 20 19:12:50 2006 +0000 2123fe5e51b7Smrg 2124fe5e51b7Smrg Bug #5587: Refactor mga_storm.c to only build once for all color depths. 2125fe5e51b7Smrg (Ian Romanick) 2126fe5e51b7Smrg 2127fe5e51b7Smrgcommit 089c7be83d6cace94a692ec46a4c3a05b32fd4f4 2128fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2129fe5e51b7SmrgDate: Wed Mar 15 20:21:23 2006 +0000 2130fe5e51b7Smrg 2131fe5e51b7Smrg Coverity #1009: Check for NULL first before assigning to pMGADRI. 2132fe5e51b7Smrg 2133fe5e51b7Smrgcommit 20eb3f159fe3629d1bfb6b9437912f55b690e068 2134fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2135fe5e51b7SmrgDate: Wed Mar 15 20:18:43 2006 +0000 2136fe5e51b7Smrg 2137fe5e51b7Smrg Coverity #92: Eliminate a dead code path. 2138fe5e51b7Smrg 2139fe5e51b7Smrgcommit 0be3b6f166709984611affad740bddaecd0bb880 2140fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2141fe5e51b7SmrgDate: Wed Dec 21 02:30:00 2005 +0000 2142fe5e51b7Smrg 2143fe5e51b7Smrg Update package version for X11R7 release. 2144fe5e51b7Smrg 2145fe5e51b7Smrgcommit 7c3b4b0ba321d2a96a6586db585e194102f51bfe 2146fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2147fe5e51b7SmrgDate: Mon Dec 19 16:25:53 2005 +0000 2148fe5e51b7Smrg 2149fe5e51b7Smrg Stub COPYING files 2150fe5e51b7Smrg 2151fe5e51b7Smrgcommit 216fcca904e358175f28b4685cdc657c4ebd2245 2152fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2153fe5e51b7SmrgDate: Mon Dec 19 09:07:50 2005 +0000 2154fe5e51b7Smrg 2155fe5e51b7Smrg Typo fixes, mailing list & url updates, and other changes to prepare for 2156fe5e51b7Smrg X11R6.9 & 7.0 releases. 2157fe5e51b7Smrg 2158fe5e51b7Smrgcommit 44ed6a4d7df5353068a1ec464aedee2754a0689c 2159fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2160fe5e51b7SmrgDate: Thu Dec 15 00:24:17 2005 +0000 2161fe5e51b7Smrg 2162fe5e51b7Smrg Update package version number for final X11R7 release candidate. 2163fe5e51b7Smrg 2164fe5e51b7Smrgcommit 051c589bc038a8f55754decfc90f4a87cec1d318 2165fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2166fe5e51b7SmrgDate: Tue Dec 6 22:48:35 2005 +0000 2167fe5e51b7Smrg 2168fe5e51b7Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 2169fe5e51b7Smrg 2170fe5e51b7Smrgcommit 8cd8149a942facfadd961b1ce5ab7a4ec4ab13f6 2171fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2172fe5e51b7SmrgDate: Sat Dec 3 05:49:34 2005 +0000 2173fe5e51b7Smrg 2174fe5e51b7Smrg Update package version number for X11R7 RC3 release. 2175fe5e51b7Smrg 2176fe5e51b7Smrgcommit 372574887ecbb78b5c88f9b70f380f18e22146c0 2177fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2178fe5e51b7SmrgDate: Fri Dec 2 02:16:08 2005 +0000 2179fe5e51b7Smrg 2180fe5e51b7Smrg Remove extraneous AC_MSG_RESULT. 2181fe5e51b7Smrg 2182fe5e51b7Smrgcommit 6431eaab73efce760730cc0214819d970fdd39f2 2183fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2184fe5e51b7SmrgDate: Wed Nov 30 18:51:34 2005 +0000 2185fe5e51b7Smrg 2186fe5e51b7Smrg Bump libdrm dep to 2.0. 2187fe5e51b7Smrg 2188fe5e51b7Smrgcommit 161a85033eecfb831d6772515b09074bd4632f3f 2189fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2190fe5e51b7SmrgDate: Tue Nov 29 23:29:59 2005 +0000 2191fe5e51b7Smrg 2192fe5e51b7Smrg Only build dlloader modules by default. 2193fe5e51b7Smrg 2194fe5e51b7Smrgcommit 352f65e64e1276511cb253bf52534a1f30776984 2195fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2196fe5e51b7SmrgDate: Mon Nov 28 22:04:09 2005 +0000 2197fe5e51b7Smrg 2198fe5e51b7Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 2199fe5e51b7Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 2200fe5e51b7Smrg 2201fe5e51b7Smrgcommit e29459c50ebcde0683aa6e33f936e8cee2eb93a9 2202fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2203fe5e51b7SmrgDate: Mon Nov 21 10:49:15 2005 +0000 2204fe5e51b7Smrg 2205fe5e51b7Smrg Add .cvsignores for drivers. 2206fe5e51b7Smrg 2207fe5e51b7Smrgcommit df888be94ca02f16e5dc2d1eabc4ede4b1e15369 2208fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2209fe5e51b7SmrgDate: Wed Nov 9 21:31:20 2005 +0000 2210fe5e51b7Smrg 2211fe5e51b7Smrg Bump version numbers for X11R6.9/X11R7 RC2. 2212fe5e51b7Smrg 2213fe5e51b7Smrgcommit 241c2b24d61266cd363f7e5f20ba8538482199df 2214fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2215fe5e51b7SmrgDate: Wed Nov 9 21:15:15 2005 +0000 2216fe5e51b7Smrg 2217fe5e51b7Smrg Update package version number for X11R7 RC2 release. 2218fe5e51b7Smrg 2219fe5e51b7Smrgcommit a04e08832096e7f6e0763fa17a3684da24916ffe 2220fe5e51b7SmrgAuthor: Matthias Hopf <mhopf@suse.de> 2221fe5e51b7SmrgDate: Wed Nov 9 17:42:58 2005 +0000 2222fe5e51b7Smrg 2223fe5e51b7Smrg Bug #4998: Add ';' and ',' as valid separators for MetaModes as well. 2224fe5e51b7Smrg 2225fe5e51b7Smrgcommit 00d81f8f104805702ee84c6d7781502bfe37f86b 2226fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2227fe5e51b7SmrgDate: Tue Nov 1 15:08:53 2005 +0000 2228fe5e51b7Smrg 2229fe5e51b7Smrg Update pkgcheck depedencies to work with separate build roots. 2230fe5e51b7Smrg 2231fe5e51b7Smrgcommit c906a237b118a80f7d9e1428ad7efd5f189232e6 2232fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2233fe5e51b7SmrgDate: Fri Oct 21 18:40:19 2005 +0000 2234fe5e51b7Smrg 2235fe5e51b7Smrg Bug #4829: Remove some useless DRI symbol checks. 2236fe5e51b7Smrg 2237fe5e51b7Smrgcommit f1db5fcc072b0066c7dbe42a2064200191ee759e 2238fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2239fe5e51b7SmrgDate: Wed Oct 19 02:48:03 2005 +0000 2240fe5e51b7Smrg 2241fe5e51b7Smrg Update package version number for RC1 release. 2242fe5e51b7Smrg 2243fe5e51b7Smrgcommit 12b4af203c4c228521c1095b6f08e02601486137 2244fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2245fe5e51b7SmrgDate: Tue Oct 18 00:01:53 2005 +0000 2246fe5e51b7Smrg 2247fe5e51b7Smrg Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro 2248fe5e51b7Smrg substitutions to work better with BSD make 2249fe5e51b7Smrg 2250fe5e51b7Smrgcommit 58ee3b290ef6b1366a1c241063120dece82802cb 2251fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2252fe5e51b7SmrgDate: Mon Oct 17 22:57:34 2005 +0000 2253fe5e51b7Smrg 2254fe5e51b7Smrg More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead 2255fe5e51b7Smrg of indirectly 2256fe5e51b7Smrg 2257fe5e51b7Smrgcommit e8f6552523f6a2f651fd596db263213eef5edcfe 2258fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2259fe5e51b7SmrgDate: Mon Oct 17 00:09:03 2005 +0000 2260fe5e51b7Smrg 2261fe5e51b7Smrg Use sed & cpp to substitute variables in driver man pages 2262fe5e51b7Smrg 2263fe5e51b7Smrgcommit 52497dac4be07bb5a4ca1a73ec6198851173b6c4 2264fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2265fe5e51b7SmrgDate: Tue Sep 27 20:53:19 2005 +0000 2266fe5e51b7Smrg 2267fe5e51b7Smrg Update build system for apm, chips, cirrus, glint, i740, mga, neomagic, 2268fe5e51b7Smrg newport to accomodate various new documentation and utility files. 2269fe5e51b7Smrg 2270fe5e51b7Smrgcommit d3a3818010a620ae57dd6831466ce9cd4137b28f 2271fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2272fe5e51b7SmrgDate: Fri Sep 9 23:15:45 2005 +0000 2273fe5e51b7Smrg 2274fe5e51b7Smrg Clean up some warnings. Fix some '#ifdef USEMGAHAL' issues that had caused 2275fe5e51b7Smrg the number of curl-braces to be unbalanced. 2276fe5e51b7Smrg 2277fe5e51b7Smrgcommit 000f59ff4686d1dbda673bf5a700f33615f9eb89 2278fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2279fe5e51b7SmrgDate: Fri Aug 26 07:10:29 2005 +0000 2280fe5e51b7Smrg 2281fe5e51b7Smrg Wrapping, escaped dashes, and other TeX syntax fixes throughout the 2282fe5e51b7Smrg manpage. (Branden Robinson, Debian #047) 2283fe5e51b7Smrg 2284fe5e51b7Smrgcommit b96b4242f98f7933fab7c1ffe95d04a8b602969e 2285fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2286fe5e51b7SmrgDate: Sun Aug 21 19:00:39 2005 +0000 2287fe5e51b7Smrg 2288fe5e51b7Smrg Fix DRI header checks, bump to 1.1.2.2. 2289fe5e51b7Smrg 2290fe5e51b7Smrgcommit db7dde6e7db534e47f43a0b371f5474d24fcaf0f 2291fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2292fe5e51b7SmrgDate: Sun Aug 21 01:11:46 2005 +0000 2293fe5e51b7Smrg 2294fe5e51b7Smrg programs/Xserver/hw/xfree86/drivers/mga/mga_bios.c #include "Xmd.h" -> 2295fe5e51b7Smrg <X11/Xmd.h> 2296fe5e51b7Smrg 2297fe5e51b7Smrgcommit 694247a948d68f711c822c2ffaa9032b3cf4255b 2298fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2299fe5e51b7SmrgDate: Thu Aug 18 09:03:47 2005 +0000 2300fe5e51b7Smrg 2301fe5e51b7Smrg Update autogen.sh to one that does objdir != srcdir. 2302fe5e51b7Smrg 2303fe5e51b7Smrgcommit eec95d13f408f5489fe8c6b611d080c275c541fb 2304fe5e51b7SmrgAuthor: Alan Hourihane <alanh@fairlite.demon.co.uk> 2305fe5e51b7SmrgDate: Mon Aug 15 07:30:05 2005 +0000 2306fe5e51b7Smrg 2307fe5e51b7Smrg Egbert's 64bit fixes for mixed 32/64bit clients 2308fe5e51b7Smrg 2309fe5e51b7Smrgcommit d4b7edf86b63fb9af377bc4605381c8016a683a5 2310fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2311fe5e51b7SmrgDate: Sun Aug 14 00:18:25 2005 +0000 2312fe5e51b7Smrg 2313fe5e51b7Smrg add mga_bios.c, bump version number. 2314fe5e51b7Smrg 2315fe5e51b7Smrgcommit 4c5535161d81174747920a2a3e70ec27a1bcf911 2316fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2317fe5e51b7SmrgDate: Fri Aug 5 23:04:33 2005 +0000 2318fe5e51b7Smrg 2319fe5e51b7Smrg I have resolved this by making all the "Direct rendering disabled" messages 2320fe5e51b7Smrg X_WARNING and all the "Direct rendering enabled" messages X_INFO. 2321fe5e51b7Smrg Ideally, we need to factor some of this stuff out to common code. There 2322fe5e51b7Smrg is a *LOT* of duplication among the *_dri.c files under 2323fe5e51b7Smrg programs/Xserver/hw/xfree86/drivers. 2324fe5e51b7Smrg I'm trying to clean up as much low hanging fruit as I can and got tired of 2325fe5e51b7Smrg waiting for ajax. :P 2326fe5e51b7Smrg 2327fe5e51b7Smrgcommit 4a7656a726cd6b848df65cbd9c18bbfd8e09fb47 2328fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2329fe5e51b7SmrgDate: Fri Aug 5 18:34:11 2005 +0000 2330fe5e51b7Smrg 2331fe5e51b7Smrg Now that Mesa has been merged into the tree, set the default value for 2332fe5e51b7Smrg OldDmaInit to false. 2333fe5e51b7Smrg 2334fe5e51b7Smrgcommit 22db234c995d12d3e538198b41fba0d555eb10c2 2335fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2336fe5e51b7SmrgDate: Sun Jul 31 17:19:29 2005 +0000 2337fe5e51b7Smrg 2338fe5e51b7Smrg Post-merge fixups: 2339fe5e51b7Smrg - Disable building the gamma driver 2340fe5e51b7Smrg - Fix numerous Imakefiles to get header paths and subdirs right 2341fe5e51b7Smrg - Symlink client-side GLX lib source from Mesa 2342fe5e51b7Smrg - Add new shader subdirs to the Mesa core build 2343fe5e51b7Smrg - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it, 2344fe5e51b7Smrg since they don't generate protocol, and it was breaking the build. 2345fe5e51b7Smrg 2346fe5e51b7Smrgcommit 67a25f0c366873050388928a6e712e8eed0e0e67 2347fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2348fe5e51b7SmrgDate: Fri Jul 29 21:22:43 2005 +0000 2349fe5e51b7Smrg 2350fe5e51b7Smrg Various changes preparing packages for RC0: 2351fe5e51b7Smrg - Verify and update package version numbers as needed 2352fe5e51b7Smrg - Implement versioning scheme 2353fe5e51b7Smrg - Change bug address to point to bugzilla bug entry form 2354fe5e51b7Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 2355fe5e51b7Smrg reenable it) 2356fe5e51b7Smrg - Fix makedepend to use pkgconfig and pass distcheck 2357fe5e51b7Smrg - Update build script to build macros first 2358fe5e51b7Smrg - Update modular Xorg version 2359fe5e51b7Smrg 2360fe5e51b7Smrgcommit 73d19fde3b2c78693298b60252e1a67e28cb708a 2361fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2362fe5e51b7SmrgDate: Thu Jul 28 15:48:19 2005 +0000 2363fe5e51b7Smrg 2364fe5e51b7Smrg Add missing backslash, patch from Donnie Berkholz 2365fe5e51b7Smrg 2366fe5e51b7Smrgcommit 3e06876c193d945f2df0c2521a2c80ec73ce5cb8 2367fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2368fe5e51b7SmrgDate: Wed Jul 27 21:23:29 2005 +0000 2369fe5e51b7Smrg 2370fe5e51b7Smrg Add xf86driproto to dependencies for drivers with DRI support. Patch from 2371fe5e51b7Smrg Donnie Berkholz 2372fe5e51b7Smrg 2373fe5e51b7Smrgcommit dccbba1b92e14df05aa351a28d4439ea4f625967 2374fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2375fe5e51b7SmrgDate: Wed Jul 27 07:38:14 2005 +0000 2376fe5e51b7Smrg 2377fe5e51b7Smrg Include binding.h to fix make distcheck 2378fe5e51b7Smrg 2379fe5e51b7Smrgcommit a5f5f658a9875ea2dfb01200305dab54ce4115ac 2380fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2381fe5e51b7SmrgDate: Tue Jul 26 18:29:39 2005 +0000 2382fe5e51b7Smrg 2383fe5e51b7Smrg symlink.sh: add binding.h from mga/HALlib add nsc/gfx add nsc/panel 2384fe5e51b7Smrg glint_driver.c: remove include of cfb8_32.h mga_driver.c: remove 2385fe5e51b7Smrg include of cfb8_32.h modularizevideodriver.sh: fix typo 2386fe5e51b7Smrg 2387fe5e51b7Smrgcommit efca764ce95094531baf14daf6e5e538cc1e9210 2388fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2389fe5e51b7SmrgDate: Tue Jul 26 01:18:43 2005 +0000 2390fe5e51b7Smrg 2391fe5e51b7Smrg "Build system for `basename $PWD | sed s/xf86-video-//`" 2392fe5e51b7Smrg 2393fe5e51b7Smrgcommit e2f4c1e72976180cfbf2486236468e25f81ca431 2394fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2395fe5e51b7SmrgDate: Tue Jul 26 00:01:58 2005 +0000 2396fe5e51b7Smrg 2397fe5e51b7Smrg Famous last words: "This last change is so trivial, I don't even need to 2398fe5e51b7Smrg compile-test it!" This commit fixes a dumb-dumb error by me. I broke 2399fe5e51b7Smrg the multi-line X_ERROR message into multiple xf86DrvMsg calls to get 2400fe5e51b7Smrg the formating correct in the log. However, I didn't bother to put in 2401fe5e51b7Smrg the correct punctuation when I did so. 2402fe5e51b7Smrg 2403fe5e51b7Smrgcommit fdb59d2535d7d517a14f3d6489ba91f3dac3b99f 2404fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2405fe5e51b7SmrgDate: Mon Jul 25 23:14:50 2005 +0000 2406fe5e51b7Smrg 2407fe5e51b7Smrg PInS data on later cards (G200 and later) contains information about the 2408fe5e51b7Smrg physical bus used for the card. This allows accurate detection of PCI 2409fe5e51b7Smrg cards that use a PCI-to-PCI bridge with an AGP chip. 2410fe5e51b7Smrg Correctly disable DRI on PCI cards used with pre-3.2 DRM. Previously the 2411fe5e51b7Smrg test was performed based on PCI ID (see above for why this is wrong) 2412fe5e51b7Smrg and was done *before* the DRM version was known. 2413fe5e51b7Smrg Bug #3759: <https://bugs.freedesktop.org/show_bug.cgi?id=3759> Correctly 2414fe5e51b7Smrg determine the PLL reference frequency from the PInS data. Previously 2415fe5e51b7Smrg the wrong bit was tested. Blame the dumb programmer that used 2416fe5e51b7Smrg cut-and-paste (that would be me). 2417fe5e51b7Smrg 2418fe5e51b7Smrgcommit 6030e8206db010f65199cbf5d332d2b47cdb3580 2419fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2420fe5e51b7SmrgDate: Mon Jul 11 02:29:51 2005 +0000 2421fe5e51b7Smrg 2422fe5e51b7Smrg Prep for modular builds by adding guarded #include "config.h" everywhere. 2423fe5e51b7Smrg 2424fe5e51b7Smrgcommit b52ca7871cb6cf7a01210ec21cd9c20e5453f4fd 2425fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2426fe5e51b7SmrgDate: Sun Jul 3 03:28:27 2005 +0000 2427fe5e51b7Smrg 2428fe5e51b7Smrg Fix build issues. 2429fe5e51b7Smrg 2430fe5e51b7Smrgcommit 800579ef040cf5df4a8b09a4a8db6118c3d84980 2431fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2432fe5e51b7SmrgDate: Fri Jul 1 16:21:35 2005 +0000 2433fe5e51b7Smrg 2434fe5e51b7Smrg Re-write the PInS processing code 2435fe5e51b7Smrg This patch dumps all of the old BIOS processing code from the MGA DDX. The 2436fe5e51b7Smrg new code, located in mga_bios.c, is modeled after the code in 2437fe5e51b7Smrg matroxfb_misc.c (though no actual code was copied). Basically, the BIOS 2438fe5e51b7Smrg is processed in one place, with "device independent" values stored in a 2439fe5e51b7Smrg data structure. This data is then used, without extra switch-statments, 2440fe5e51b7Smrg throughout the driver. 2441fe5e51b7Smrg In addition, this patch adds support for processing the BIOS on PowerPC 2442fe5e51b7Smrg systems. On PPC cards, the magic offset values (that give the location 2443fe5e51b7Smrg of the PInS data) is not in the BIOS. Instead the driver has to search 2444fe5e51b7Smrg the BIOS for the PInS structure signature. The patch does this and 2445fe5e51b7Smrg correctly handles byte-ordering (and data alignement) issues. 2446fe5e51b7Smrg This code has been tested on an AGP G400 on x86 and a PCI G450 on PowerPC. 2447fe5e51b7Smrg NOTE: The file mga_bios.h is also removed. The "documentation" in that file 2448fe5e51b7Smrg was moved to the file mga_PInS.txt. This file documents, as much as 2449fe5e51b7Smrg possible, the layout of the various PInS datastructure versions. The 2450fe5e51b7Smrg information in that file is 100% based on the old mga_bios.h and the 2451fe5e51b7Smrg code in matroxfb_misc.c. No additional information from Matrox 2452fe5e51b7Smrg documentation is included in that file. This just puts the information 2453fe5e51b7Smrg that was already known in one place. 2454fe5e51b7Smrg Xorg Bug: 3553 2455fe5e51b7Smrg 2456fe5e51b7Smrgcommit acadff30e40af48592e50e55a94f9c81ab856971 2457fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2458fe5e51b7SmrgDate: Sat Jun 25 21:16:55 2005 +0000 2459fe5e51b7Smrg 2460fe5e51b7Smrg Bug #3626: _X_EXPORT tags for video and input drivers. 2461fe5e51b7Smrg 2462fe5e51b7Smrgcommit 784cd8fabf5a356a8ce501c635e4d09f39a17a0f 2463fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2464fe5e51b7SmrgDate: Thu Jun 16 00:11:24 2005 +0000 2465fe5e51b7Smrg 2466fe5e51b7Smrg Actually commit fix for #3528 2467fe5e51b7Smrg 2468fe5e51b7Smrgcommit 89db1e50a85521189926e1e73b1ddfb4a3e12be0 2469fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2470fe5e51b7SmrgDate: Wed Jun 15 22:38:36 2005 +0000 2471fe5e51b7Smrg 2472fe5e51b7Smrg Temporary fixes to work-around the "old" MGA client-side driver in the 2473fe5e51b7Smrg tree. 2474fe5e51b7Smrg 2475fe5e51b7Smrgcommit a6e0ae358bdb26452444d916a956c07da7fe88f4 2476fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2477fe5e51b7SmrgDate: Wed Jun 15 20:06:43 2005 +0000 2478fe5e51b7Smrg 2479fe5e51b7Smrg Adds support for MGA DRM version 3.2. 2480fe5e51b7Smrg Update MGA DDX to use new features of MGA DRM ersion 3.2 to enable DRI 2481fe5e51b7Smrg support on PCI cards. Backwards compatability with older client-side 2482fe5e51b7Smrg drivers is enabled with new Device section settings. See mga.man for 2483fe5e51b7Smrg details. 2484fe5e51b7Smrg Xorg bug: 3259 Reviewed by: Eric Anholt 2485fe5e51b7Smrg 2486fe5e51b7Smrgcommit c2e50aad47ce32f528dad2abee8b7a8df363c93e 2487fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com> 2488fe5e51b7SmrgDate: Tue Jun 7 23:20:02 2005 +0000 2489fe5e51b7Smrg 2490fe5e51b7Smrg Numerous comments, clean-ups, and refactorings for the DRI portion of the 2491fe5e51b7Smrg MGA driver. 2492fe5e51b7Smrg - Use mga_drm.h instead of mga_common.h. Due to this, all the MGA-specific 2493fe5e51b7Smrg DRM names were changed to generic versions (i.e., drmMGALock became 2494fe5e51b7Smrg drm_lock_t). 2495fe5e51b7Smrg - Merge MGADRIMapInit into MGADRIAGPInit and rename the resulting function 2496fe5e51b7Smrg MGADRIBootstrapDMA. 2497fe5e51b7Smrg - Eliminate several unnecessary drmMap calls. The server has no need to map 2498fe5e51b7Smrg MMIO space, primary DMA buffer space, secondary DMA buffer space, WARP 2499fe5e51b7Smrg microcode space, or the DRM status page. 2500fe5e51b7Smrg - Clarified which portions of the client / server DRI interface are no 2501fe5e51b7Smrg longer used. 2502fe5e51b7Smrg - Removed some unused fields from MGADRIServerPrivateRec. 2503fe5e51b7Smrg - Bump MGA_PATCHLEVEL. 2504fe5e51b7Smrg Reviewed by: Adam Jackson Reviewed by: Eric Anholt 2505fe5e51b7Smrg 2506fe5e51b7Smrgcommit f4b3779cafdbcfeaddf6f55c4b2c67a667ab5d14 2507fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2508fe5e51b7SmrgDate: Wed May 18 17:47:35 2005 +0000 2509fe5e51b7Smrg 2510fe5e51b7Smrg Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version 2511fe5e51b7Smrg number of the DRIInfoRec, disambiguating it from the XF86DRI protocol 2512fe5e51b7Smrg version number. Modify DRIQueryVersion to return the libdri version 2513fe5e51b7Smrg number, which all DDXes were requesting implicitly. Fix the DDXes to 2514fe5e51b7Smrg check for the DRIINFO version they were compiled against. 2515fe5e51b7Smrg 2516fe5e51b7Smrgcommit 1b6392ffb792212016e710aaf27ffe36e5703d36 2517fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2518fe5e51b7SmrgDate: Wed Apr 20 12:25:28 2005 +0000 2519fe5e51b7Smrg 2520fe5e51b7Smrg Fix includes right throughout the Xserver tree: 2521fe5e51b7Smrg change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; 2522fe5e51b7Smrg change "foo.h", "extensions/foo.h" and "X11/foo.h" to 2523fe5e51b7Smrg <X11/extensions/foo.h> for extension headers, e.g. Xv.h; 2524fe5e51b7Smrg change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. 2525fe5e51b7Smrg 2526fe5e51b7Smrgcommit 58e70eb5ef3b0a2d4ac2950c45670a660691b1f6 2527fe5e51b7SmrgAuthor: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> 2528fe5e51b7SmrgDate: Sat Dec 4 00:43:09 2004 +0000 2529fe5e51b7Smrg 2530fe5e51b7Smrg Encoding of numerous files changed to UTF-8 2531fe5e51b7Smrg 2532fe5e51b7Smrgcommit 99eab59d167595a7deefc55b2c3226bc861a4986 2533fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2534fe5e51b7SmrgDate: Mon Aug 16 09:13:14 2004 +0000 2535fe5e51b7Smrg 2536fe5e51b7Smrg Bug #1087: Make sure all the *Weak symbols are documented in the import 2537fe5e51b7Smrg list, so the loader knows not to complain about unresolved symbols when 2538fe5e51b7Smrg an optional module isn't loaded. This typically manifests as warnings 2539fe5e51b7Smrg about fbdevHW symbols when the user isn't using the framebuffer 2540fe5e51b7Smrg console. 2541fe5e51b7Smrg 2542fe5e51b7Smrgcommit f29f2239d31232e152744321c447035ede658ce2 2543fe5e51b7SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2544fe5e51b7SmrgDate: Fri Aug 13 18:24:08 2004 +0000 2545fe5e51b7Smrg 2546fe5e51b7Smrg Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com> 2547fe5e51b7Smrg Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike 2548fe5e51b7Smrg Harris. 2549fe5e51b7Smrg Call xf86EnableDisableFBAccess though the function pointer instead of 2550fe5e51b7Smrg directly. #1041, Patch from Aaron Plattner. 2551fe5e51b7Smrg Swap the phsyical size of the screen when rotiation. #1050, Patch from 2552fe5e51b7Smrg Aaron Plattner. 2553fe5e51b7Smrg Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com> 2554fe5e51b7Smrg Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead 2555fe5e51b7Smrg of proping it. This way it will work with the monolithic version too. 2556fe5e51b7Smrg #1062, Patch by Owen Taylor. 2557fe5e51b7Smrg 2558fe5e51b7Smrgcommit d9e1c04184e016604a9c84d53970c783f0849d2a 2559fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org> 2560fe5e51b7SmrgDate: Mon Aug 9 22:37:22 2004 +0000 2561fe5e51b7Smrg 2562fe5e51b7Smrg Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339, 2563fe5e51b7Smrg Harold L. Hunt II, Alexander Gottwald). 2564fe5e51b7Smrg Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao, 2565fe5e51b7Smrg David Dawes). 2566fe5e51b7Smrg Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson). 2567fe5e51b7Smrg HP-PA build fix (Bug #828, Guy Martin, Paul Anderson). 2568fe5e51b7Smrg Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine). 2569fe5e51b7Smrg Fix attempt to read video ROM before enabling it (Bug #843, Ivan 2570fe5e51b7Smrg Kokshaysky, Mike A. Harris). 2571fe5e51b7Smrg Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A. 2572fe5e51b7Smrg Harris). 2573fe5e51b7Smrg Clarify xset man page description of how to use the keyboard repeat rate 2574fe5e51b7Smrg settings (Bug #846, Mike A. Harris). 2575fe5e51b7Smrg Fix problem where print-screen key would get remapped to sys-req in certain 2576fe5e51b7Smrg keymaps, which broke GNOME printscreen functionality (Bug #847, Owen 2577fe5e51b7Smrg Taylor). 2578fe5e51b7Smrg Fix several render problems: 2579fe5e51b7Smrg - MMIO mode support 2580fe5e51b7Smrg - Hang on IGP chips 2581fe5e51b7Smrg - VT switching hang 2582fe5e51b7Smrg - 3D render corruption (Bug #922, Hui Yu). 2583fe5e51b7Smrg 2584fe5e51b7Smrgcommit 7043429714bbe667f74ead4e5f3465e27695c996 2585fe5e51b7SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 2586fe5e51b7SmrgDate: Tue Aug 3 08:52:16 2004 +0000 2587fe5e51b7Smrg 2588fe5e51b7Smrg Fix declaration of XAACachePlanarMonoStippleProc. Rename 2589fe5e51b7Smrg XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for 2590fe5e51b7Smrg consistency with other parts of xaa and fix forward declaration in 2591fe5e51b7Smrg xaalocal.h. Fixes last comments on Bug #962. 2592fe5e51b7Smrg 2593fe5e51b7Smrgcommit a44da97b743cf5f131bb6a7709ba72e30701be8b 2594fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2595fe5e51b7SmrgDate: Tue Aug 3 02:44:21 2004 +0000 2596fe5e51b7Smrg 2597fe5e51b7Smrg Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so 2598fe5e51b7Smrg DoLoadableServer NO builds work again. 2599fe5e51b7Smrg 2600fe5e51b7Smrgcommit 4db80992d38311deaefdbe5da1c41b2c14102e1a 2601fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2602fe5e51b7SmrgDate: Sat Jul 31 01:21:18 2004 +0000 2603fe5e51b7Smrg 2604fe5e51b7Smrg Change several LoaderSymbol calls introduced by the bug #400 patch to 2605fe5e51b7Smrg *Weak() resolver functions. 2606fe5e51b7Smrg 2607fe5e51b7Smrgcommit dd173d29d2c2bd73bea8eef018b1c6dd6b7a967c 2608fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2609fe5e51b7SmrgDate: Fri Jul 30 20:30:52 2004 +0000 2610fe5e51b7Smrg 2611fe5e51b7Smrg Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all 2612fe5e51b7Smrg framebuffer formats except cfb and the overlay modes should work, and 2613fe5e51b7Smrg r128 and radeon need to be loaded from the ati driver (both issues to 2614fe5e51b7Smrg be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga 2615fe5e51b7Smrg drivers. elfloader users shouldn't be affected. 2616fe5e51b7Smrg 2617fe5e51b7Smrgcommit e12aa54892259cdfef7c0f9419b58f0b9d4163d7 2618fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2619fe5e51b7SmrgDate: Fri Jul 30 18:40:36 2004 +0000 2620fe5e51b7Smrg 2621fe5e51b7Smrg Fixed typo in a comment. 2622fe5e51b7Smrg Deleted bogus comment. 2623fe5e51b7Smrg Added debugging support. 2624fe5e51b7Smrg 2625fe5e51b7Smrgcommit 4f86d37662c0fe3f27a886f7947e009235103e6b 2626fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 2627fe5e51b7SmrgDate: Tue Jul 27 02:55:47 2004 +0000 2628fe5e51b7Smrg 2629fe5e51b7Smrg - add mga_maven.h; needed for mga maven support (Ryan Underwood) 2630fe5e51b7Smrg 2631fe5e51b7Smrgcommit 9ae7f9446d049a1fad550f5f681bc557de158c10 2632fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 2633fe5e51b7SmrgDate: Tue Jul 27 02:50:41 2004 +0000 2634fe5e51b7Smrg 2635fe5e51b7Smrg - enable maven support for TV detection, DPMS, and DDC on crtc2 on G400 2636fe5e51b7Smrg (Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098) 2637fe5e51b7Smrg - expose I2CStart; needed for mga maven support (Ryan Underwood) 2638fe5e51b7Smrg 2639fe5e51b7Smrgcommit 8b030a847771f6b34bf38913eb6b53543f320f29 2640fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com> 2641fe5e51b7SmrgDate: Mon Jul 26 23:14:37 2004 +0000 2642fe5e51b7Smrg 2643fe5e51b7Smrg - Add Radeon DynamicClocks option 2644fe5e51b7Smrg - Add small fixes and clean ups from ati's last code drop (typo_fixes, 2645fe5e51b7Smrg remove_fudge, laptop, xvfix) 2646fe5e51b7Smrg - fix possible segfault in mga_dri.c (Ryan Underwood) 2647fe5e51b7Smrg - Add Xv support to pre-nm2160 neomagic chipsets 2648fe5e51b7Smrg 2649fe5e51b7Smrgcommit e9a123f08880882a519b6eba8305d62ac375ca10 2650fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2651fe5e51b7SmrgDate: Wed Jun 16 09:44:00 2004 +0000 2652fe5e51b7Smrg 2653fe5e51b7Smrg Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, 2654fe5e51b7Smrg with the following notes: 2655fe5e51b7Smrg - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to 2656fe5e51b7Smrg insecurity. 2657fe5e51b7Smrg - VIA driver converted to new drmContext and drmHandle names. 2658fe5e51b7Smrg - Radeon driver merge conflicted in many places, and MergedFB at least 2659fe5e51b7Smrg could probably use some checking at this point. 2660fe5e51b7Smrg 2661fe5e51b7Smrgcommit 1ca2311bee53e99b49a860862e4010e58c918585 2662fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2663fe5e51b7SmrgDate: Wed Jun 16 09:26:24 2004 +0000 2664fe5e51b7Smrg 2665fe5e51b7Smrg DRI trunk-20040613 import 2666fe5e51b7Smrg 2667fe5e51b7Smrgcommit 7cbb9f870b020742a254f1e9aadd0209b1f0a876 2668fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2669fe5e51b7SmrgDate: Wed Jun 16 09:23:24 2004 +0000 2670fe5e51b7Smrg 2671fe5e51b7Smrg DRI XFree86-4_3_99_12-merge import 2672fe5e51b7Smrg 2673fe5e51b7Smrgcommit 9dd51de1d530c6081333d30f945afb6d9208a77f 2674fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2675fe5e51b7SmrgDate: Fri Apr 23 19:38:38 2004 +0000 2676fe5e51b7Smrg 2677fe5e51b7Smrg Merging XORG-CURRENT into trunk 2678fe5e51b7Smrg 2679fe5e51b7Smrgcommit f02d171b227e657f02a0b99a28cff7cbda21a583 2680fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2681fe5e51b7SmrgDate: Sun Mar 14 08:33:25 2004 +0000 2682fe5e51b7Smrg 2683fe5e51b7Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2684fe5e51b7Smrg 2685fe5e51b7Smrgcommit d8072750f830173e3c9eefae8364d12190b20c26 2686fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2687fe5e51b7SmrgDate: Wed Mar 3 12:12:19 2004 +0000 2688fe5e51b7Smrg 2689fe5e51b7Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2690fe5e51b7Smrg 2691fe5e51b7Smrgcommit ddb58a6e1be274dce96cc7c29965a45c2294c5d3 2692fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2693fe5e51b7SmrgDate: Thu Feb 26 13:35:53 2004 +0000 2694fe5e51b7Smrg 2695fe5e51b7Smrg readding XFree86's cvs IDs 2696fe5e51b7Smrg 2697fe5e51b7Smrgcommit 0d050fbd293089d93bd78b58b1b454dc2ced8cdf 2698fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de> 2699fe5e51b7SmrgDate: Thu Feb 26 09:23:19 2004 +0000 2700fe5e51b7Smrg 2701fe5e51b7Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2702fe5e51b7Smrg 2703fe5e51b7Smrgcommit 64c0cb99b62c87052374f63d3e31e2603eab2f9c 2704fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2705fe5e51b7SmrgDate: Mon Feb 23 20:35:03 2004 +0000 2706fe5e51b7Smrg 2707fe5e51b7Smrg Import most of XFree86 4.4RC3. This import excludes files which have the 2708fe5e51b7Smrg new license. If we want to, later we can import 4.4RC3 again and pick 2709fe5e51b7Smrg up the files that have the new license, but for now the vendor branch 2710fe5e51b7Smrg is "pure." 2711fe5e51b7Smrg 2712fe5e51b7Smrgcommit bf37df17ecf040836ad8924a9174787d0f57ed5a 2713fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2714fe5e51b7SmrgDate: Tue Nov 25 19:28:37 2003 +0000 2715fe5e51b7Smrg 2716fe5e51b7Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 2717fe5e51b7Smrg 2718fe5e51b7Smrgcommit d3b3c858814952bc7344a4154e981851fd9bb494 2719fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2720fe5e51b7SmrgDate: Fri Nov 14 16:48:55 2003 +0000 2721fe5e51b7Smrg 2722fe5e51b7Smrg XFree86 4.3.0.1 2723fe5e51b7Smrg 2724fe5e51b7Smrgcommit 1e444800e5935c1c5678aaa9fa3751c4519f42e4 2725fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2726fe5e51b7SmrgDate: Fri Nov 14 16:48:55 2003 +0000 2727fe5e51b7Smrg 2728fe5e51b7Smrg Initial revision 2729