xserver-xorg-video-mga: Changes to 'debian-unstable'
COPYING | 241 ++++++++++++++++
ChangeLog | 62 ++++
Makefile.am | 2
README | 13
configure.ac | 8
debian/README.source | 73 +++++
debian/changelog | 10
debian/control | 2
debian/copyright | 185 +++++++++++-
debian/xserver-xorg-video-mga.install | 1
debian/xsfbs/xsfbs.sh | 12
src/mga.h | 2
src/mga_bios.c | 1
src/mga_driver.c | 484 ++++++++--------------------------
src/mga_esc.c | 2
src/mga_merge.c | 1
src/mga_shadow.c | 1
src/mga_video.c | 1
18 files changed, 690 insertions(+), 411 deletions(-)
New commits:
commit 91650ca8894472142c9e9cb3c00f7129e7200919
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 12:33:10 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index f5f4922..689d42f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.4.11.dfsg-1) unstable; urgency=low
[ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -10,7 +10,7 @@ xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* Update debian/copyright from upstream's COPYING.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:25:16 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:33:04 +0200
xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low
commit 85ef08383242ed58d2d90487538dbe08efd8a51a
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 12:32:48 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-mga.install b/debian/xserver-xorg-video-mga.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-mga.install
+++ b/debian/xserver-xorg-video-mga.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit 1db132450c33f81b6a9fed2e2f13c32de5ec7364
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 12:25:34 2009 +0200
Update debian/copyright from upstream COPYING
diff --git a/debian/changelog b/debian/changelog
index 00134c3..f5f4922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
+ * Update debian/copyright from upstream's COPYING.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:17:43 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:25:16 +0200
xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 41b7da5..a5e621c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,34 @@
This package was downloaded from
+git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mga.
+Release tarballs are available at
http://xorg.freedesktop.org/releases/individual/driver/
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
+***********************************************************
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,6 +51,8 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
+***********************************************************
+
Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
Permission to use, copy, modify, distribute, and sell this software and its
@@ -43,6 +73,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+***********************************************************
Copyright 2000 VA Linux Systems Inc., Fremont, California.
All Rights Reserved.
@@ -66,27 +97,145 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
+***********************************************************
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+Copyright 2006 Red Hat, Inc.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software")
+to deal in the software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+them Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
+***********************************************************
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+STEPHEN CROWLEY, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+(c) 1999 Matrox Graphics Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+Copyright © 1997, Matrox Graphics Inc.
+All Rights Reserved.
+
+***********************************************************
+
+Copyright 2000 Gareth Hughes
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Authors:
+ Gareth Hughes <gareth@valinux.com>
+
+***********************************************************
+
+(C) Copyright IBM Corporation 2005
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
commit 64a1ea67133e3b77a42d188ae6d0617aef63d14c
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 12:18:24 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index c78f10d..5dcfa84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+commit 319bba2b759ec64287935e2fb16491f75a3169af
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:28 2009 +1000
+
+ mga: bump for release 1.4.11
+
+commit e29477ef4d4ae50c39ef608ad0e2344c5c68ed40
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ mga: change to using ABI version check
+
+commit 26ca92acc58b74202ec5eacaffc8e418d878da5e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:31 2009 +1000
+
+ mga: update for resources/RAC API removal
+
+commit c1b8e89f367510958ffa8072ccbf416a13790c96
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jul 9 13:09:42 2009 -0400
+
+ xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+ Adding the macro in configure.ac and use it in Makefile.am
+ Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 828b55d822f644976df40c8b835043895b7785e3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:06:19 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit afda628bf77d4c6d58de6f1b88a8fa5391f1df1a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 22:20:56 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit 2972b5707bbee5ac0d046b5100bcf572d82e1c4d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 6 14:12:35 2009 -0400
+
+ Do E-EDID if built against a server that supports it.
+
+commit b3fc1acaedd5d45b2c8eb2ba99b24579cf7d2a79
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 6 13:02:36 2009 -0400
+
+ Normalize DDC for the second head.
+
+ The exit path wasn't symmetric with the exit path for the first head.
+
+commit bf6aee62b891d4305cb96f8a37e625e5cf7c1504
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 6 12:04:48 2009 -0400
+
+ Remove redundant MGAuseI2C macro
+
commit 626af26098ab5d0823bf1d6c08157b4c89ec578a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 27 14:01:03 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index e442d16..00134c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low
[ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -6,9 +6,10 @@ xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low
* Renumber 03_no_nonfree.diff to 01.
[ Brice Goglin ]
+ * New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:17:06 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 12:17:43 +0200
xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low
commit 62a35c79d8101791ad548c4fa96a1218877f7e9d
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
mga: bump for release 1.4.11
diff --git a/configure.ac b/configure.ac
index 1067ffe..3f5803f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-mga],
- 1.4.10,
+ 1.4.11,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-mga)
commit cc06e9f11172e67e39bdb727e08991d48cfb9893
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
mga: change to using ABI version check
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 1d0eb8e..e0b724b 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -53,7 +53,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit fa8524ea3da8261569479c23919ad1b6b3d7dd24
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:31 2009 +1000
mga: update for resources/RAC API removal
diff --git a/src/mga.h b/src/mga.h
index a831862..18652a8 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -464,9 +464,9 @@ typedef struct {
#else
pciVideoPtr PciInfo;
PCITAG PciTag;
+ xf86AccessRec Access;
#endif
const struct mga_device_attributes * chip_attribs;
- xf86AccessRec Access;
int Chipset;
int ChipRev;
diff --git a/src/mga_bios.c b/src/mga_bios.c
index c015077..b533dd1 100644
--- a/src/mga_bios.c
+++ b/src/mga_bios.c
@@ -41,7 +41,6 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
/* All drivers need this */
diff --git a/src/mga_driver.c b/src/mga_driver.c
index d1e2210..1d0eb8e 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -52,7 +52,11 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
/* All drivers need this */
@@ -75,7 +79,7 @@
#include "micmap.h"
#include "xf86DDC.h"
-#include "xf86RAC.h"
+
#include "vbe.h"
#include "fb.h"
@@ -435,25 +439,25 @@ static SymTabRec MGAChipsets[] = {
};
static PciChipsets MGAPciChipsets[] = {
- { PCI_CHIP_MGA2064, PCI_CHIP_MGA2064, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGA1064, PCI_CHIP_MGA1064, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGA2164, PCI_CHIP_MGA2164, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,(resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG100, PCI_CHIP_MGAG100, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,(resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG200, PCI_CHIP_MGAG200, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,(resRange*)RES_SHARED_VGA },
+ { PCI_CHIP_MGA2064, PCI_CHIP_MGA2064, RES_SHARED_VGA },
+ { PCI_CHIP_MGA1064, PCI_CHIP_MGA1064, RES_SHARED_VGA },
+ { PCI_CHIP_MGA2164, PCI_CHIP_MGA2164, RES_SHARED_VGA },
+ { PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,RES_SHARED_VGA },
+ { PCI_CHIP_MGAG100, PCI_CHIP_MGAG100, RES_SHARED_VGA },
+ { PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,RES_SHARED_VGA },
+ { PCI_CHIP_MGAG200, PCI_CHIP_MGAG200, RES_SHARED_VGA },
+ { PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_SE_B_PCI, PCI_CHIP_MGAG200_SE_B_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_SE_A_PCI, PCI_CHIP_MGAG200_SE_A_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
- (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG400, PCI_CHIP_MGAG400, (resRange*)RES_SHARED_VGA },
- { PCI_CHIP_MGAG550, PCI_CHIP_MGAG550, (resRange*)RES_SHARED_VGA },
- { -1, -1, (resRange*)RES_UNDEFINED }
+ RES_SHARED_VGA },
+ { PCI_CHIP_MGAG400, PCI_CHIP_MGAG400, RES_SHARED_VGA },
+ { PCI_CHIP_MGAG550, PCI_CHIP_MGAG550, RES_SHARED_VGA },
+ { -1, -1, RES_UNDEFINED }
};
/*
@@ -1514,8 +1518,10 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
pMga->Primary = xf86IsPrimaryPci(pMga->PciInfo);
#ifndef DISABLE_VGA_IO
+#ifndef XSERVER_LIBPCIACCESS
xf86SetOperatingState(resVgaIo, pMga->pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pMga->pEnt->index, ResDisableOpr);
+#endif
#else
/*
* Set our own access functions, which control the vgaioen bit.
@@ -1772,12 +1778,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
}
#endif
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(pMga->pEnt->index, NULL, ResExclusive)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"xf86RegisterResources() found resource conflicts\n");
MGAFreeRec(pScrn);
return FALSE;
}
+#endif
/*
* The first thing we should figure out is the depth, bpp, etc.
diff --git a/src/mga_esc.c b/src/mga_esc.c
index 47b36a8..e811712 100644
--- a/src/mga_esc.c
+++ b/src/mga_esc.c
@@ -15,7 +15,6 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
/* All drivers need this */
@@ -36,7 +35,6 @@
#include "micmap.h"
#include "xf86DDC.h"
-#include "xf86RAC.h"
#include "vbe.h"
#include "fb.h"
diff --git a/src/mga_merge.c b/src/mga_merge.c
index 24bcbc1..4cfa0a7 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -5,7 +5,6 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
/* All drivers need this */
diff --git a/src/mga_shadow.c b/src/mga_shadow.c
index 4dc03d3..f928690 100644
--- a/src/mga_shadow.c
+++ b/src/mga_shadow.c
@@ -9,7 +9,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "mga_reg.h"
diff --git a/src/mga_video.c b/src/mga_video.c
index bf60c1d..a69c973 100644
--- a/src/mga_video.c
+++ b/src/mga_video.c
@@ -4,7 +4,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit d6cff0064853e53ae0aab63eb78903a650468268
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jul 9 13:09:42 2009 -0400
xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611
Adding the macro in configure.ac and use it in Makefile.am
Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 44f8234..4fd3261 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,6 @@ EXTRA_DIST = README_HALLIB mga_PInS.txt ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 3a04b21..1067ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,11 @@ XORG_RELEASE_VERSION
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
+
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -173,6 +178,7 @@ AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
commit 485cbffa6c813205da9d561b74b0707fe3726962
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:06:19 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 1665195..d1e2210 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -526,186 +526,6 @@ static const OptionInfoRec MGAOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-#ifdef USE_EXA
-static const char *exaSymbols[] = {
- "exaDriverInit",
- "exaDriverFini",
- "exaGetPixmapOffset",
- "exaGetVersion",
- NULL
-};
-#endif
-
-#ifdef USE_XAA
-static const char *xaaSymbols[] = {
- "XAACachePlanarMonoStipple",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- "XAAMoveDWORDS",
- "XAA_888_plus_PICT_a8_to_8888",
- NULL
-};
-#endif
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBind",
- "drmAgpDeviceId",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmAgpVendorId",
- "drmCommandNone",
- "drmCommandWrite",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetDeviceInfo",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-#endif
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWGetVidmem",
- "fbdevHWInit",
- "fbdevHWLeaveVTWeak",
- "fbdevHWLoadPaletteWeak",
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSwitchModeWeak",
- "fbdevHWUnmapMMIO",
- "fbdevHWUnmapVidmem",
- "fbdevHWUseBuildinMode",
- "fbdevHWValidModeWeak",
- NULL
-};
-
-#ifdef USEMGAHAL
-static const char *halSymbols[] = {
- "MGACloseLibrary",
- "MGAGetBOARDHANDLESize",
- "MGAGetHardwareInfo",
- "MGAOpenLibrary",
- "MGARestoreVgaState",
- "MGASaveVgaState",
- "MGASetMode",
- "MGASetVgaMode",
- "MGAValidateMode",
- "MGAValidateVideoParameters",
- "HALSetDisplayStart",
- NULL
-};
-#endif
#ifdef XFree86LOADER
static MODULESETUPPROTO(mgaSetup);
@@ -736,34 +556,6 @@ mgaSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&MGA_C_NAME, module, 1);
-
- /*
- * Modules that this driver always requires may be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols,
-#ifdef USE_XAA
- xaaSymbols,
-#endif
-#ifdef USE_EXA
- exaSymbols,
-#endif
- ramdacSymbols, ddcSymbols, i2cSymbols,
- shadowSymbols, fbdevHWSymbols, vbeSymbols,
- fbSymbols, int10Symbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols,
-#endif
-#ifdef USEMGAHAL
- halSymbols,
-#endif
- NULL);
-
/*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
@@ -1418,9 +1210,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
/* Load DDC if we have the code to use it */
/* This gives us DDC1 */
if (pMga->ddc1Read || pMga->i2cInit) {
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "ddc")) {
/* ddc module not found, we can do without it */
pMga->ddc1Read = NULL;
pMga->DDC_Bus1 = NULL;
@@ -1433,9 +1223,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
/* - DDC can use I2C bus */
/* Load I2C if we have the code to use it */
if (pMga->i2cInit) {
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "i2c")) {
/* i2c module not found, we can do without it */
pMga->i2cInit = NULL;
pMga->DDC_Bus1 = NULL;
@@ -1710,8 +1498,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -1818,7 +1604,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
}
if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
- xf86LoaderReqSymLists(halSymbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
pMga->HALLoaded = TRUE;
} else {
@@ -2013,7 +1798,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
/* check for linux framebuffer device */
if (!xf86LoadSubModule(pScrn, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, pMga->PciInfo, NULL))
return FALSE;
}
@@ -2114,7 +1898,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pMga->pEnt->index);
if (pInt) pMga->softbooted = TRUE;
@@ -2884,8 +2667,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA if needed */
if (!pMga->NoAccel) {
@@ -2894,14 +2675,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "exa")) {
MGAFreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(exaSymbols, NULL);
+ }
} else {
#endif
#ifdef USE_XAA
if (!xf86LoadSubModule(pScrn, "xaa")) {
MGAFreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(xaaSymbols, NULL);
+ }
#endif
#ifdef USE_EXA
}
@@ -2914,7 +2695,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -2923,15 +2703,12 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
MGAFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
Reply to: