xf86-video-mga: Changes to 'master'
Ian Romanick
idr at kemper.freedesktop.org
Wed Aug 22 12:02:04 PDT 2007
configure.ac | 12
src/clientlx.c | 16
src/mga.h | 61 +++
src/mga_bios.c | 15
src/mga_dac3026.c | 10
src/mga_dacG.c | 50 ++
src/mga_dri.c | 74 +---
src/mga_driver.c | 960 +++++++++++++++++++++++++++++++++---------------------
src/mga_macros.h | 20 -
src/mga_merge.c | 6
src/mga_storm.c | 33 -
src/mga_vga.c | 4
12 files changed, 803 insertions(+), 458 deletions(-)
New commits:
commit 90beb8c27b4206b593898d346bf37ab49e75b975
Author: Ian Romanick <idr at us.ibm.com>
Date: Wed Aug 22 11:19:46 2007 -0700
Set pScrn to NULL before calling xf86ConfigPciEntity.
Why is the interface to xf86ConfigPciEntity so filled with hate?
commit 55d219394ad6af8e25ff604bcbb49d5a551bd348
Author: Ian Romanick <idr at us.ibm.com>
Date: Wed Aug 22 10:43:39 2007 -0700
Merge PCI-rework support and "classic" PCI interface support into one tree
First pass at merging both trees. So far, this has only been tested
on the PCI-rework build on a PCI G450.
commit f4ef39d53d5a67942707507814fef4ad466dc909
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Aug 20 15:36:57 2007 -0700
Fix compile error introduced by merge.
commit 707d3adbc7d9ee918d6c70083f51ad851ce68852
Merge: 741c50c... 489e007...
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Aug 20 15:20:39 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit 741c50c162986a14647301c2c5f8e080a7664efd
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Feb 2 15:50:14 2007 -0800
Code refactoring in MGAScreenInit.
Rearrange code so that functions that are selected based on MergedFB
and SecondCrtc are selected in one place instead of 3. Rearrange some
code that selects on FBDev and Primary to flow a little better.
commit 4432091b2597cf4bba09009622d247c0d8ff151f
Author: Ian Romanick <idr at us.ibm.com>
Date: Thu Feb 1 13:45:18 2007 -0800
Ensure the result of MGAMapMem is checked.
Add GCC warn_unused_result attribute to MGAMapMem. Add a check of the
return value to one place that was missing it (in MGACountRam), and
check the return of that function.
commit 3a47132af4dfab420e3c35d7d100dd93fb7bf9c6
Author: Ian Romanick <idr at us.ibm.com>
Date: Thu Feb 1 13:30:34 2007 -0800
Refactor memory map / unmap functions.
MGAMapMem and MGAMapMemFBDev were refactored into a single function.
This happens to fix a bug triggered in software XAA paths because
MGAMapMem did not set FbStart. MGAUnmapMem and MGAUnmapMemFBDev were
also refactored into a single function.
commit 916d41bcf99bbf666bf634edb1c72b90d9b16ea0
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Jan 15 11:42:52 2007 -0800
Convert to new pci_device_cfg_write_u* interface.
commit b26bfefb7ea107be3949daea0f6beca6d80c09d4
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Jan 15 11:42:07 2007 -0800
Pass the correct pointer to pci_device_cfg_write_bits.
commit d5b4dbe749e860e4349607c57467f8085dc28c33
Merge: cb103a1... 876657e...
Author: Ian Romanick <idr at us.ibm.com>
Date: Tue Jan 9 16:04:06 2007 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit cb103a18067adb3256c0b791255ce8435ff57e06
Merge: d0e0362... 4bcfca9...
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Dec 11 15:06:19 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit d0e03622811fd94c830c0b5233ff505392c0d331
Merge: 8fee907... 1dd6e69...
Author: Ian Romanick <idr at us.ibm.com>
Date: Mon Dec 11 15:06:03 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
Conflicts:
src/mga_macros.h
commit 8fee907cac7e5924630e3648bfb72ad9bd021ea8
Merge: 7cecee1... 2fc0ebf...
Author: Ian Romanick <idr at us.ibm.com>
Date: Tue Oct 10 11:43:52 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit 7cecee186c889902bed9b7fa042f0bd3cc0297ef
Merge: 160b1f7... bde5920...
Author: Ian Romanick <idr at umwelt.(none)>
Date: Thu Aug 10 10:19:55 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit 160b1f79fab7266a24b7d1a680cdf29bad9707c1
Author: Ian Romanick <idr at umwelt.(none)>
Date: Tue Aug 8 16:59:15 2006 -0700
Store the pci_device pointer passed into MGAPciProbe instead of
searching for it in MGAPreInit.
commit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68
Merge: 95e0722... 7170de8...
Author: Ian Romanick <idr at umwelt.(none)>
Date: Wed Jul 26 11:47:32 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
commit 95e0722ff2e8878cdd6bb0e349eecab042b879db
Author: Ian Romanick <idr at umwelt.(none)>
Date: Wed Jul 26 11:46:52 2006 -0700
Current state of MGA driver modified to work with the xserver
pci-rework branch.
More information about the xorg-commit
mailing list