update to xf86-video-mga 1.4.11. Tested by landry@
This commit is contained in:
matthieu
parent
18dd1d8fc7
commit
dfdb9035a8
@ -1,12 +1,237 @@
|
||||
This is a stub file. This package has not yet had its complete licensing
|
||||
information compiled. Please see the individual source files for details on
|
||||
your rights to use and modify this software.
|
||||
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
|
||||
|
||||
Please submit updated COPYING files to the Xorg bugzilla:
|
||||
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:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
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
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
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 THE
|
||||
OPEN GROUP 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 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
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation, and that the name of Robin Cutshaw not be used in
|
||||
advertising or publicity pertaining to distribution of the software without
|
||||
specific, written prior permission. Robin Cutshaw makes no representations
|
||||
about the suitability of this software for any purpose. It is provided
|
||||
"as is" without express or implied warranty.
|
||||
|
||||
ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
EVENT SHALL ROBIN CUTSHAW BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
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.
|
||||
|
||||
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
|
||||
VA LINUX SYSTEMS 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.
|
||||
|
||||
***********************************************************
|
||||
|
||||
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
|
||||
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 (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 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.
|
||||
|
||||
***********************************************************
|
||||
|
||||
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.
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
@ -1,3 +1,217 @@
|
||||
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
|
||||
|
||||
mga 1.4.10
|
||||
|
||||
commit d33b06038223b2b121be7e3f8c207de5f518b28c
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Apr 27 14:00:00 2009 -0400
|
||||
|
||||
Fix ChangeLog generation
|
||||
|
||||
commit 06b6ead9a1b367e08ed6b3e75dfde0ee3b4a82b8
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Apr 27 13:37:42 2009 -0400
|
||||
|
||||
G200SE: Only force 16bpp on low-memory cards
|
||||
|
||||
commit 8b84fe236a42336e87048317880cc437494655f1
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Apr 27 13:36:45 2009 -0400
|
||||
|
||||
Move device ID and memory sizing much earlier in setup
|
||||
|
||||
commit 9a82c5db3f8332d10b31d68e5b86d3a6b136dc5e
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Apr 27 13:26:03 2009 -0400
|
||||
|
||||
Fix xf86ModeBandwidth check
|
||||
|
||||
commit 58888aefd0bad7bfca231ec7a54865d9c26c8095
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Apr 27 13:19:42 2009 -0400
|
||||
|
||||
Remove a leftover from overlay support
|
||||
|
||||
commit 19c44d537e982fcf0fe2dc9f3273ac6166302510
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Tue Apr 21 10:00:24 2009 -0400
|
||||
|
||||
Fixed bad vga access in memory count routine.
|
||||
|
||||
commit 2388c4d512554258bce2b78c8f8aa1151b161c3e
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Tue Apr 21 09:51:34 2009 -0400
|
||||
|
||||
Force pitch of 1024 for G200SE Pilot1 when edid is used as modeline.
|
||||
|
||||
commit 32bc0bcec815a363a47b9e7337d06370baf0c0d4
|
||||
Author: Stefan Dirsch <sndirsch@suse.de>
|
||||
Date: Thu Apr 16 15:34:12 2009 +0200
|
||||
|
||||
Prevent MergedFB setups from crashing.
|
||||
|
||||
Second time mga_read_and_process_bios() is called pMga->chip_attribs
|
||||
is a NULL pointer for some reason. (#21022)
|
||||
|
||||
commit 70681daa0392e5fa413f888d92a30ddacdcc9c8c
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Tue Mar 31 11:41:00 2009 -0400
|
||||
|
||||
Fixed G200SE PLL selection routine of m,n,p.
|
||||
|
||||
commit c955c1fdabfe0449369d0ccf31ab7e6ef3d7bffe
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Mon Mar 30 13:38:39 2009 -0400
|
||||
|
||||
fixed memory count rountine for G200eW to detect up to 16Megs on X server without libpciaccess.
|
||||
|
||||
commit 16a5e3a7e13c0a2c1091ad452250cbc231b8f427
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Thu Mar 26 10:58:06 2009 -0400
|
||||
|
||||
Modified memory count rountine for G200eW to detect up to 16Megs.
|
||||
|
||||
commit 36ae47b82310d96f158694765105fc010911702f
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Wed Mar 11 16:31:43 2009 -0400
|
||||
|
||||
Fixed bad access issues and ddc1 implementation for IP core.
|
||||
Fixed a bug in PLL programming sequence for G200eW/G200eV where a register IO offset was used instead of
|
||||
a memory offset.
|
||||
Removed clock selection toggling in PLL programming sequence for G200eW.
|
||||
Fixed ddc1 protocol to support correct I/O lines according to chip attribute.
|
||||
Fixed a bug in CRTC2 programming seqence where a register IO offset was used instead of a memory offset.
|
||||
|
||||
commit 669acb55023bce505f4a912bed6f1e9f3efa2856
|
||||
Author: Thomas Jaeger <ThJaeger@gmail.com>
|
||||
Date: Fri Jan 30 16:18:34 2009 -0500
|
||||
|
||||
Fall back to software for unsupported repeat modes
|
||||
|
||||
[anholt: dropped unneded ->repeat check -- it's a misguided compat field for
|
||||
drivers from before repeatType existed]
|
||||
|
||||
commit 496342b09b7379bff95627ec357d4dd24123dc85
|
||||
Author: Chris Ball <cjb@laptop.org>
|
||||
Date: Fri Feb 27 10:54:17 2009 -0500
|
||||
|
||||
Revert "Build fix for EXA 3"
|
||||
|
||||
This reverts commit 4aac5618278d47a801bef40d3eede1c360c1ea28.
|
||||
The EXA developers have backed out this ABI bump.
|
||||
|
||||
Signed-off-by: Chris Ball <cjb@laptop.org>
|
||||
|
||||
commit 4aac5618278d47a801bef40d3eede1c360c1ea28
|
||||
Author: Chris Ball <cjb@laptop.org>
|
||||
Date: Tue Feb 24 12:48:54 2009 -0500
|
||||
|
||||
Build fix for EXA 3
|
||||
|
||||
EXA in xserver head now requires us to pass -DEXA_DRIVER_KNOWN_MAJOR=3.
|
||||
|
||||
Signed-off-by: Chris Ball <cjb@laptop.org>
|
||||
|
||||
commit 0e9df5fe820d69387355c3ef857cde4cc72220b0
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 30 20:41:56 2009 -0800
|
||||
|
||||
Add README with pointers to mailing list, bugzilla & git repos
|
||||
|
||||
commit aa64a0c7b31858802f953b787991ef9c22a94cc5
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Wed Jan 21 09:56:41 2009 -0500
|
||||
|
||||
Updated PLL algorithm for G200eW.
|
||||
Changed the m,n,p selection for G200eW and programming sequence.
|
||||
|
||||
commit 808d887d910636aaa64c42d6add896e9f9b1833a
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 9 16:30:43 2009 -0800
|
||||
|
||||
Remove xorgconfig & xorgcfg from See Also list in man page
|
||||
|
||||
commit ba376973ae0d25557fdcd920e03474c0e6632e97
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Thu Nov 20 23:02:49 2008 -0500
|
||||
|
||||
Fixed PLL m,n,p selection for G200eW to respect byte granularity.
|
||||
Renamed G200 eW Winbond ID string to Nuvoton.
|
||||
Added EV suffix to G200 Maxim.
|
||||
Blocked double scan mode for G200 eW.
|
||||
Fixed memory bandwidth limitation for G200eW to 318.77 Mhz.
|
||||
Added a workaround (blit 1x1 with rop=xor) to fix the black screen problem for G200eW.
|
||||
|
||||
commit 01e60b391f39f2ebcf2eeb3be2424a2e291ec8ca
|
||||
Author: Yannick Heneault <yheneaul@matrox.com>
|
||||
Date: Wed Oct 1 21:39:40 2008 -0400
|
||||
|
||||
fixed winbond/nuvoton min pll clock to correct value (18.75Mhz).
|
||||
|
||||
commit a0ebccaa10668bff6a51d9c027cd43e29a030e2b
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Jul 2 15:02:32 2008 -0400
|
||||
|
||||
mga 1.4.9
|
||||
|
||||
commit 62c8f0ad5bb3dd23226a6b481ed4f260c6770f55
|
||||
Author: Yannick Henault <yheneaul@matrox.com>
|
||||
Date: Mon Jun 30 17:00:16 2008 -0400
|
||||
|
||||
@ -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
|
||||
|
||||
@ -55,7 +55,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
@ -90,7 +90,6 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
@ -107,6 +106,7 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
@ -134,6 +134,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -178,15 +179,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -203,24 +198,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -671,7 +674,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.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
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
25
driver/xf86-video-mga/README
Normal file
25
driver/xf86-video-mga/README
Normal file
@ -0,0 +1,25 @@
|
||||
xf86-video-mga - Matrox video driver for the Xorg X server
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mga
|
||||
|
||||
http://cgit.freedesktop.org/xorg/driver/xf86-video-mga
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
260
driver/xf86-video-mga/aclocal.m4
vendored
260
driver/xf86-video-mga/aclocal.m4
vendored
@ -7631,6 +7631,7 @@ AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl
|
||||
@ -7667,27 +7668,24 @@ dnl of the copyright holder.
|
||||
# your configure.ac with the minimum required version, such as:
|
||||
# XORG_MACROS_VERSION(1.1)
|
||||
#
|
||||
# To force at least a version with this macro defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
# To ensure that this macro is defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION],
|
||||
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
#
|
||||
#
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
[XORG_MACROS_needed_version=$1
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.6
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||
fi
|
||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.3.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
|
||||
m4_if(m4_version_compare(vers_have, [$1]), -1,
|
||||
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
|
||||
m4_undefine([vers_have])
|
||||
m4_undefine([maj_have])
|
||||
m4_undefine([maj_needed])
|
||||
]) # XORG_MACROS_VERSION
|
||||
|
||||
# XORG_PROG_RAWCPP()
|
||||
@ -7712,6 +7710,10 @@ else
|
||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS=-undef
|
||||
AC_MSG_RESULT([yes])
|
||||
# under Cygwin unix is still defined even with -undef
|
||||
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS="-undef -ansi"
|
||||
AC_MSG_RESULT([yes, with -ansi])
|
||||
else
|
||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||
fi
|
||||
@ -7824,7 +7826,9 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# Whether or not the necessary tools and files are found can be checked
|
||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
@ -7880,7 +7884,9 @@ AC_SUBST(MAKE_HTML)
|
||||
# indicates whether the necessary tools and files are found and, if set,
|
||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
BUILDTXTDOC=no
|
||||
BUILDPDFDOC=no
|
||||
@ -7946,7 +7952,7 @@ AC_SUBST(MAKE_HTML)
|
||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||
AC_ARG_ENABLE(malloc0returnsnull,
|
||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||
AS_HELP_STRING([--enable-malloc0returnsnull],
|
||||
[malloc(0) returns NULL (default: auto)]),
|
||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||
@ -7998,7 +8004,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||
[Use a lint-style source code checker (default: disabled)])],
|
||||
[use_lint=$withval], [use_lint=no])
|
||||
if test "x$use_lint" = "xyes" ; then
|
||||
@ -8039,7 +8045,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||
AC_REQUIRE([XORG_WITH_LINT])
|
||||
# Build lint "library" for more indepth checks of programs calling this library
|
||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||
[Create lint library (default: disabled)])],
|
||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||
if test "x$make_lint_lib" != "xno" ; then
|
||||
@ -8057,6 +8063,154 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
]) # XORG_LINT_LIBRARY
|
||||
|
||||
# XORG_CWARNFLAGS
|
||||
# ---------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
# -----------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
AC_ARG_ENABLE(strict-compilation,
|
||||
AS_HELP_STRING([--enable-strict-compilation],
|
||||
[Enable all warnings from compiler and make them errors (default: disabled)]),
|
||||
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
|
||||
if test "x$STRICT_COMPILE" = "xyes"; then
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
|
||||
if test "x$GCC" = xyes ; then
|
||||
STRICT_CFLAGS="-pedantic -Werror"
|
||||
elif test "x$SUNCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-errwarn"
|
||||
elif test "x$INTELCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-Werror"
|
||||
fi
|
||||
fi
|
||||
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
||||
AC_SUBST([CWARNFLAGS])
|
||||
]) # XORG_STRICT_OPTION
|
||||
|
||||
# XORG_DEFAULT_OPTIONS
|
||||
# --------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_MANPAGE_SECTIONS
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
dnl copyright notice and this permission notice appear in supporting
|
||||
dnl documentation.
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included
|
||||
dnl in all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||
dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XORG_RELEASE_VERSION
|
||||
# --------------------
|
||||
# Adds --with/without-release-string and changes the PACKAGE and
|
||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AS_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
if test "x$RELEASE_VERSION" != "x"; then
|
||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||
[$PVP],
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
# XORG_CHANGELOG()
|
||||
# ----------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines the variable CHANGELOG_CMD as the command to generate
|
||||
# ChangeLog from git.
|
||||
#
|
||||
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(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)"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -8106,65 +8260,3 @@ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||
fi
|
||||
])
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
dnl copyright notice and this permission notice appear in supporting
|
||||
dnl documentation.
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included
|
||||
dnl in all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||
dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XORG_RELEASE_VERSION
|
||||
# --------------------
|
||||
# Adds --with/without-release-string and changes the PACKAGE and
|
||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AC_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
if test "x$RELEASE_VERSION" != "x"; then
|
||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||
[$PVP],
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
|
||||
9695
driver/xf86-video-mga/configure
vendored
9695
driver/xf86-video-mga/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -22,9 +22,8 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
|
||||
# When the version number is modified here, also modify it in src/mga.h.
|
||||
AC_INIT([xf86-video-mga],
|
||||
1.4.9,
|
||||
1.4.11,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-mga)
|
||||
|
||||
@ -32,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])
|
||||
@ -109,10 +113,16 @@ CFLAGS="$XORG_CFLAGS"
|
||||
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||||
[XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
|
||||
[#include "xorg-server.h"])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$XORG_CFLAGS"
|
||||
AC_CHECK_DECL(xf86ModeBandwidth,
|
||||
[AC_DEFINE(HAVE_XF86MODEBANDWIDTH, 1, [Have xf86ModeBandwidth])],
|
||||
[],
|
||||
[#include "xf86Modes.h"])
|
||||
[#include <X11/extensions/randr.h>
|
||||
#include "xorg-server.h"
|
||||
#include "xf86Modes.h"])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
|
||||
@ -168,6 +178,7 @@ AC_SUBST([DRIVER_NAME])
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
|
||||
@ -2127,17 +2127,6 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
# The preopen pass in lib mode reverses $deplibs; put it back here
|
||||
# so that -L comes before libs that need it for instance...
|
||||
if test "$linkmode,$pass" = "lib,link"; then
|
||||
## FIXME: Find the place where the list is rebuilt in the wrong
|
||||
## order, and fix it there properly
|
||||
tmp_deplibs=
|
||||
for deplib in $deplibs; do
|
||||
tmp_deplibs="$deplib $tmp_deplibs"
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
fi
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
|
||||
@ -99,6 +99,7 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
@ -126,6 +127,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -170,15 +172,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -195,24 +191,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@ -170,7 +170,7 @@ option is primarily intended for testing purposes, but it could also
|
||||
be used on systems with a buggy or poorly function AGP implementation.
|
||||
Default: off.
|
||||
.SH "SEE ALSO"
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
.SH AUTHORS
|
||||
Authors include: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy
|
||||
Desbief, Dirk Hohndel, Doug Merritt, Andrew E. Mileski, Andrew van der Stock,
|
||||
|
||||
@ -134,6 +134,7 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
@ -161,6 +162,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -205,15 +207,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -230,24 +226,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -41,7 +41,6 @@
|
||||
/* All drivers should typically include these */
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Resources.h"
|
||||
|
||||
/* All drivers need this */
|
||||
|
||||
@ -326,8 +325,9 @@ Bool mga_read_and_process_bios( ScrnInfoPtr pScrn )
|
||||
* isn't found or can't be read we'll still have some reasonable values
|
||||
* to use.
|
||||
*/
|
||||
(void) memcpy(& pMga->bios, & pMga->chip_attribs->default_bios_values,
|
||||
sizeof(struct mga_bios_values));
|
||||
if (pMga->chip_attribs)
|
||||
(void) memcpy(& pMga->bios, & pMga->chip_attribs->default_bios_values,
|
||||
sizeof(struct mga_bios_values));
|
||||
|
||||
|
||||
/* If the BIOS address was probed, it was found from the PCI config space
|
||||
|
||||
@ -55,9 +55,104 @@ static void MGAGLoadPalette(ScrnInfoPtr, int, int*, LOCO*, VisualPtr);
|
||||
static Bool MGAG_i2cInit(ScrnInfoPtr pScrn);
|
||||
|
||||
static void
|
||||
MGAG200IPComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
|
||||
MGAG200SEComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
|
||||
{
|
||||
unsigned int ulComputedFo;
|
||||
unsigned int ulFDelta;
|
||||
unsigned int ulFPermitedDelta;
|
||||
unsigned int ulFTmpDelta;
|
||||
unsigned int ulVCOMax, ulVCOMin;
|
||||
unsigned int ulTestP;
|
||||
unsigned int ulTestM;
|
||||
unsigned int ulTestN;
|
||||
unsigned int ulPLLFreqRef;
|
||||
|
||||
ulVCOMax = 320000;
|
||||
ulVCOMin = 160000;
|
||||
ulPLLFreqRef = 25000;
|
||||
|
||||
ulFDelta = 0xFFFFFFFF;
|
||||
/* Permited delta is 0.5% as VESA Specification */
|
||||
ulFPermitedDelta = lFo * 5 / 1000;
|
||||
|
||||
/* Then we need to minimize the M while staying within 0.5% */
|
||||
for (ulTestP = 8; ulTestP > 0; ulTestP >>= 1) {
|
||||
if ((lFo * ulTestP) > ulVCOMax) continue;
|
||||
if ((lFo * ulTestP) < ulVCOMin) continue;
|
||||
|
||||
for (ulTestN = 17; ulTestN <= 256; ulTestN++) {
|
||||
for (ulTestM = 1; ulTestM <= 32; ulTestM++) {
|
||||
ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
|
||||
if (ulComputedFo > lFo)
|
||||
ulFTmpDelta = ulComputedFo - lFo;
|
||||
else
|
||||
ulFTmpDelta = lFo - ulComputedFo;
|
||||
|
||||
if (ulFTmpDelta < ulFDelta) {
|
||||
ulFDelta = ulFTmpDelta;
|
||||
*M = ulTestM - 1;
|
||||
*N = ulTestN - 1;
|
||||
*P = ulTestP - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
MGAG200EVComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
|
||||
{
|
||||
unsigned int ulComputedFo;
|
||||
unsigned int ulFDelta;
|
||||
unsigned int ulFPermitedDelta;
|
||||
unsigned int ulFTmpDelta;
|
||||
unsigned int ulTestP;
|
||||
unsigned int ulTestM;
|
||||
unsigned int ulTestN;
|
||||
unsigned int ulVCOMax;
|
||||
unsigned int ulVCOMin;
|
||||
unsigned int ulPLLFreqRef;
|
||||
|
||||
ulVCOMax = 550000;
|
||||
ulVCOMin = 150000;
|
||||
ulPLLFreqRef = 50000;
|
||||
|
||||
ulFDelta = 0xFFFFFFFF;
|
||||
/* Permited delta is 0.5% as VESA Specification */
|
||||
ulFPermitedDelta = lFo * 5 / 1000;
|
||||
|
||||
/* Then we need to minimize the M while staying within 0.5% */
|
||||
for (ulTestP = 16; ulTestP > 0; ulTestP--) {
|
||||
if ((lFo * ulTestP) > ulVCOMax) continue;
|
||||
if ((lFo * ulTestP) < ulVCOMin) continue;
|
||||
|
||||
for (ulTestN = 1; ulTestN <= 256; ulTestN++) {
|
||||
for (ulTestM = 1; ulTestM <= 16; ulTestM++) {
|
||||
ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
|
||||
if (ulComputedFo > lFo)
|
||||
ulFTmpDelta = ulComputedFo - lFo;
|
||||
else
|
||||
ulFTmpDelta = lFo - ulComputedFo;
|
||||
|
||||
if (ulFTmpDelta < ulFDelta) {
|
||||
ulFDelta = ulFTmpDelta;
|
||||
*M = (CARD8)(ulTestM - 1);
|
||||
*N = (CARD8)(ulTestN - 1);
|
||||
*P = (CARD8)(ulTestP - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#if DEBUG
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"lFo=%ld n=0x%x m=0x%x p=0x%x \n",
|
||||
lFo, *N, *M, *P );
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
MGAG200WBComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
|
||||
{
|
||||
MGAPtr pMga = MGAPTR(pScrn);
|
||||
unsigned int ulComputedFo;
|
||||
unsigned int ulFDelta;
|
||||
unsigned int ulFPermitedDelta;
|
||||
@ -73,61 +168,37 @@ MGAG200IPComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
|
||||
unsigned int ulTestMStart;
|
||||
unsigned int ulTestMEnd;
|
||||
|
||||
if (pMga->is_G200SE) {
|
||||
ulVCOMax = 320000;
|
||||
ulVCOMin = 160000;
|
||||
ulPLLFreqRef = 25000;
|
||||
ulTestPStart = 8;
|
||||
ulTestNStart = 17;
|
||||
ulTestNEnd = 32;
|
||||
ulTestMStart = 1;
|
||||
ulTestMEnd = 32;
|
||||
} else if (pMga->is_G200EV) {
|
||||
ulVCOMax = 550000;
|
||||
ulVCOMin = 150000;
|
||||
ulPLLFreqRef = 50000;
|
||||
ulTestPStart = 16;
|
||||
ulTestNStart = 1;
|
||||
ulTestNEnd = 256;
|
||||
ulTestMStart = 1;
|
||||
ulTestMEnd = 16;
|
||||
} else if (pMga->is_G200WB) {
|
||||
ulVCOMax = 680000;
|
||||
ulVCOMin = 150000;
|
||||
ulPLLFreqRef = 48000;
|
||||
ulTestPStart = 8;
|
||||
ulTestNStart = 1;
|
||||
ulTestNEnd = 512;
|
||||
ulTestMStart = 3;
|
||||
ulTestMEnd = 25;
|
||||
}
|
||||
ulVCOMax = 550000;
|
||||
ulVCOMin = 150000;
|
||||
ulPLLFreqRef = 48000;
|
||||
ulTestPStart = 1;
|
||||
ulTestNStart = 1;
|
||||
ulTestNEnd = 150;
|
||||
ulTestMStart = 1;
|
||||
ulTestMEnd = 16;
|
||||
|
||||
ulFDelta = 0xFFFFFFFF;
|
||||
/* Permited delta is 0.5% as VESA Specification */
|
||||
ulFPermitedDelta = lFo * 5 / 1000;
|
||||
ulFPermitedDelta = lFo * 5 / 1000;
|
||||
|
||||
/* Then we need to minimize the M while staying within 0.5% */
|
||||
for (ulTestP = ulTestPStart; ulTestP > 0; ulTestP--) {
|
||||
for (ulTestP = ulTestPStart; ulTestP < 9; ulTestP++) {
|
||||
if ((lFo * ulTestP) > ulVCOMax) continue;
|
||||
if ((lFo * ulTestP) < ulVCOMin) continue;
|
||||
|
||||
for (ulTestN = ulTestNStart; ulTestN <= ulTestNEnd; ulTestN++) {
|
||||
for (ulTestM = ulTestMStart; ulTestM <= ulTestMEnd; ulTestM++) {
|
||||
for (ulTestM = ulTestMStart; ulTestM <= ulTestMEnd; ulTestM++) {
|
||||
for (ulTestN = ulTestNStart; ulTestN <= ulTestNEnd; ulTestN++) {
|
||||
ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
|
||||
if (ulComputedFo > lFo)
|
||||
ulFTmpDelta = ulComputedFo - lFo;
|
||||
ulFTmpDelta = ulComputedFo - lFo;
|
||||
else
|
||||
ulFTmpDelta = lFo - ulComputedFo;
|
||||
ulFTmpDelta = lFo - ulComputedFo;
|
||||
|
||||
if (ulFTmpDelta < ulFDelta) {
|
||||
ulFDelta = ulFTmpDelta;
|
||||
if (pMga->is_G200WB) {
|
||||
*M = (ulTestM - 1) | (((ulTestN -1) >> 1) & 0x80);
|
||||
} else {
|
||||
*M = ulTestM - 1;
|
||||
}
|
||||
*N = ulTestN - 1;
|
||||
*P = ulTestP - 1;
|
||||
*M = (CARD8)(ulTestM - 1) | (CARD8)(((ulTestN -1) >> 1) & 0x80);
|
||||
*N = (CARD8)(ulTestN - 1);
|
||||
*P = (CARD8)(ulTestP - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -144,12 +215,7 @@ MGAG200EVPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
|
||||
{
|
||||
MGAPtr pMga = MGAPTR(pScrn);
|
||||
|
||||
unsigned long ulFallBackCounter;
|
||||
unsigned char ucTempByte, ucPixCtrl;
|
||||
unsigned char ucM;
|
||||
unsigned char ucN;
|
||||
unsigned char ucP;
|
||||
unsigned char ucS;
|
||||
|
||||
// Set pixclkdis to 1
|
||||
ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
@ -157,9 +223,9 @@ MGAG200EVPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
|
||||
|
||||
// Select PLL Set C
|
||||
ucTempByte = INREG8(MGAREG_MISC_READ);
|
||||
ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
|
||||
ucTempByte |= 0x3<<2; //select MGA pixel clock
|
||||
OUTREG8(MGAREG_MISC_WRITE, ucTempByte);
|
||||
OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
|
||||
|
||||
// Set pixlock to 0
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_PLL_STAT);
|
||||
@ -214,99 +280,133 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
|
||||
{
|
||||
MGAPtr pMga = MGAPTR(pScrn);
|
||||
|
||||
unsigned long ulFallBackCounter;
|
||||
unsigned char ucTempByte, ucPixCtrl;
|
||||
unsigned char ucM;
|
||||
unsigned char ucN;
|
||||
unsigned char ucP;
|
||||
unsigned char ucS;
|
||||
unsigned long ulLoopCount, ulLockCheckIterations = 0, ulTempCount, ulVCount;
|
||||
unsigned char ucTempByte, ucPixCtrl, ucPLLLocked = FALSE;
|
||||
|
||||
// Set pixclkdis to 1
|
||||
ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
|
||||
while(ulLockCheckIterations <= 32 && ucPLLLocked == FALSE)
|
||||
{
|
||||
if(ulLockCheckIterations > 0)
|
||||
{
|
||||
OUTREG8(MGAREG_CRTCEXT_INDEX, 0x1E);
|
||||
ucTempByte = INREG8(MGAREG_CRTCEXT_DATA);
|
||||
if(ucTempByte < 0xFF)
|
||||
{
|
||||
OUTREG8(MGAREG_CRTCEXT_DATA, ucTempByte+1);
|
||||
}
|
||||
}
|
||||
|
||||
ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
|
||||
ucTempByte |= MGA1064_REMHEADCTL_CLKDIS;
|
||||
outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
|
||||
// Set pixclkdis to 1
|
||||
ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
|
||||
|
||||
// Select PLL Set C
|
||||
ucTempByte = INREG8(MGAREG_MISC_READ);
|
||||
ucTempByte |= 0x3<<2; //select MGA pixel clock
|
||||
OUTREG8(MGAREG_MISC_WRITE, ucTempByte);
|
||||
ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
|
||||
ucTempByte |= MGA1064_REMHEADCTL_CLKDIS;
|
||||
outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
|
||||
|
||||
// Set pixlock to 0
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_PLL_STAT);
|
||||
outMGAdac(MGA1064_PIX_PLL_STAT, ucTempByte & ~0x40);
|
||||
// Select PLL Set C
|
||||
ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
|
||||
ucTempByte |= 0x3<<2; //select MGA pixel clock
|
||||
OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
|
||||
|
||||
ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN | 0x80;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
|
||||
// Set pixlock to 0
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_PLL_STAT);
|
||||
outMGAdac(MGA1064_PIX_PLL_STAT, ucTempByte & ~0x40);
|
||||
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN | 0x80;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
|
||||
|
||||
// Reset the PLL
|
||||
// When we are varying the output frequency by more than
|
||||
// 10%, we must reset the PLL. However to be prudent, we
|
||||
// will reset it each time that we are changing it.
|
||||
ucTempByte = inMGAdac(MGA1064_VREF_CTL);
|
||||
ucTempByte &= ~0x04;
|
||||
outMGAdac(MGA1064_VREF_CTL, ucTempByte );
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
// Reset the PLL
|
||||
// When we are varying the output frequency by more than
|
||||
// 10%, we must reset the PLL. However to be prudent, we
|
||||
// will reset it each time that we are changing it.
|
||||
ucTempByte = inMGAdac(MGA1064_VREF_CTL);
|
||||
ucTempByte &= ~0x04;
|
||||
outMGAdac(MGA1064_VREF_CTL, ucTempByte );
|
||||
|
||||
// Program the Pixel PLL Register
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_M, mgaReg->PllM);
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_N, mgaReg->PllN);
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_P, mgaReg->PllP);
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
// Program the Pixel PLL Register
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_M, mgaReg->PllM);
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_N, mgaReg->PllN);
|
||||
outMGAdac(MGA1064_WB_PIX_PLLC_P, mgaReg->PllP);
|
||||
|
||||
ucTempByte = INREG8(MGAREG_MISC_READ);
|
||||
OUTREG8(MGAREG_MISC_WRITE, ucTempByte & ~0x08);
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
|
||||
OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
|
||||
|
||||
OUTREG8(MGAREG_MISC_WRITE, ucTempByte);
|
||||
// Wait 50 us
|
||||
usleep(50);
|
||||
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
|
||||
|
||||
// Turning the PLL on
|
||||
ucTempByte = inMGAdac(MGA1064_VREF_CTL);
|
||||
ucTempByte |= 0x04;
|
||||
outMGAdac(MGA1064_VREF_CTL, ucTempByte );
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
// Turning the PLL on
|
||||
ucTempByte = inMGAdac(MGA1064_VREF_CTL);
|
||||
ucTempByte |= 0x04;
|
||||
outMGAdac(MGA1064_VREF_CTL, ucTempByte );
|
||||
|
||||
// Select the pixel PLL by setting pixclksel to 1
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucTempByte &= ~MGA1064_PIX_CLK_CTL_SEL_MSK;
|
||||
ucTempByte |= MGA1064_PIX_CLK_CTL_SEL_PLL;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
|
||||
// Wait 500 us
|
||||
usleep(500);
|
||||
|
||||
ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
|
||||
ucTempByte &= ~MGA1064_REMHEADCTL_CLKSL_MSK;
|
||||
ucTempByte |= MGA1064_REMHEADCTL_CLKSL_PLL;
|
||||
outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
|
||||
// Select the pixel PLL by setting pixclksel to 1
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucTempByte &= ~MGA1064_PIX_CLK_CTL_SEL_MSK;
|
||||
ucTempByte |= MGA1064_PIX_CLK_CTL_SEL_PLL;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
|
||||
|
||||
// Set pixlock to 1
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_PLL_STAT);
|
||||
outMGAdac(MGA1064_PIX_PLL_STAT, ucTempByte | 0x40);
|
||||
ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
|
||||
ucTempByte &= ~MGA1064_REMHEADCTL_CLKSL_MSK;
|
||||
ucTempByte |= MGA1064_REMHEADCTL_CLKSL_PLL;
|
||||
outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
|
||||
|
||||
// Reset dotclock rate bit.
|
||||
OUTREG8(MGAREG_SEQ_INDEX, 1);
|
||||
ucTempByte = INREG8(MGAREG_SEQ_DATA);
|
||||
OUTREG8(MGAREG_SEQ_DATA, ucTempByte & ~0x8);
|
||||
// Set pixlock to 1
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_PLL_STAT);
|
||||
outMGAdac(MGA1064_PIX_PLL_STAT, ucTempByte | 0x40);
|
||||
|
||||
// Set pixclkdis to 0
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
|
||||
// Reset dotclock rate bit.
|
||||
OUTREG8(MGAREG_SEQ_INDEX, 1);
|
||||
ucTempByte = INREG8(MGAREG_SEQ_DATA);
|
||||
OUTREG8(MGAREG_SEQ_DATA, ucTempByte & ~0x8);
|
||||
|
||||
// Set pixclkdis to 0
|
||||
ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
|
||||
ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
|
||||
outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
|
||||
|
||||
// Poll VCount. If it increments twice inside 150us,
|
||||
// we assume that the PLL has locked.
|
||||
ulLoopCount = 0;
|
||||
ulVCount = INREG(MGAREG_VCOUNT);
|
||||
|
||||
while(ulLoopCount < 30 && ucPLLLocked == FALSE)
|
||||
{
|
||||
ulTempCount = INREG(MGAREG_VCOUNT);
|
||||
|
||||
if(ulTempCount < ulVCount)
|
||||
{
|
||||
ulVCount = 0;
|
||||
}
|
||||
if ((ucTempByte - ulVCount) > 2)
|
||||
{
|
||||
ucPLLLocked = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
usleep(5);
|
||||
}
|
||||
ulLoopCount++;
|
||||
}
|
||||
ulLockCheckIterations++;
|
||||
}
|
||||
|
||||
// Set remclkdis to 0
|
||||
ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
|
||||
@ -525,6 +625,7 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out )
|
||||
|
||||
/* Pixel clock values */
|
||||
int m, n, p, s;
|
||||
m = n = p = s = 0;
|
||||
|
||||
if(MGAISGx50(pMga)) {
|
||||
pReg->Clock = f_out;
|
||||
@ -532,17 +633,24 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out )
|
||||
}
|
||||
|
||||
if (pMga->is_G200SE) {
|
||||
MGAG200IPComputePLLParam(pScrn, f_out, &m, &n, &p);
|
||||
MGAG200SEComputePLLParam(pScrn, f_out, &m, &n, &p);
|
||||
|
||||
pReg->DacRegs[ MGA1064_PIX_PLLC_M ] = m;
|
||||
pReg->DacRegs[ MGA1064_PIX_PLLC_N ] = n;
|
||||
pReg->DacRegs[ MGA1064_PIX_PLLC_P ] = p;
|
||||
} else if (pMga->is_G200EV || pMga->is_G200WB) {
|
||||
MGAG200IPComputePLLParam(pScrn, f_out, &m, &n, &p);
|
||||
} else if (pMga->is_G200EV) {
|
||||
MGAG200EVComputePLLParam(pScrn, f_out, &m, &n, &p);
|
||||
|
||||
pReg->PllM = m;
|
||||
pReg->PllN = n;
|
||||
pReg->PllP = p;
|
||||
} else {
|
||||
} else if (pMga->is_G200WB) {
|
||||
MGAG200WBComputePLLParam(pScrn, f_out, &m, &n, &p);
|
||||
|
||||
pReg->PllM = m;
|
||||
pReg->PllN = n;
|
||||
pReg->PllP = p;
|
||||
} else {
|
||||
/* Do the calculations for m, n, p and s */
|
||||
MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
|
||||
|
||||
@ -1503,9 +1611,17 @@ MGAG_ddc1Read(ScrnInfoPtr pScrn)
|
||||
{
|
||||
MGAPtr pMga = MGAPTR(pScrn);
|
||||
unsigned char val;
|
||||
|
||||
int i2c_index;
|
||||
|
||||
if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
|
||||
i2c_index = 3;
|
||||
else
|
||||
i2c_index = 0;
|
||||
|
||||
const struct mgag_i2c_private *p = & i2c_priv[i2c_index];
|
||||
|
||||
/* Define the SDA as an input */
|
||||
outMGAdacmsk(MGA1064_GEN_IO_CTL, ~(DDC_P1_SCL_MASK | DDC_P1_SDA_MASK), 0);
|
||||
outMGAdacmsk(MGA1064_GEN_IO_CTL, ~(p->scl_mask | p->sda_mask), 0);
|
||||
|
||||
/* wait for Vsync */
|
||||
if (pMga->is_G200SE) {
|
||||
@ -1516,7 +1632,7 @@ MGAG_ddc1Read(ScrnInfoPtr pScrn)
|
||||
}
|
||||
|
||||
/* Get the result */
|
||||
val = (inMGAdac(MGA1064_GEN_IO_DATA) & DDC_P1_SDA_MASK);
|
||||
val = (inMGAdac(MGA1064_GEN_IO_DATA) & p->sda_mask);
|
||||
return val;
|
||||
}
|
||||
|
||||
@ -1592,7 +1708,6 @@ Bool
|
||||
MGAG_i2cInit(ScrnInfoPtr pScrn)
|
||||
{
|
||||
MGAPtr pMga = MGAPTR(pScrn);
|
||||
I2CBusPtr I2CPtr;
|
||||
|
||||
if (pMga->SecondCrtc == FALSE) {
|
||||
int i2c_index;
|
||||
|
||||
@ -251,9 +251,9 @@ void MGAEnableSecondOutPut(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
|
||||
|
||||
|
||||
/* We don't use MISC synch pol, must be 0*/
|
||||
ucByte = inMGAdreg( MGAREG_MISC_READ);
|
||||
ucByte = INREG8( MGAREG_MEM_MISC_READ);
|
||||
|
||||
OUTREG8(MGAREG_MISC_WRITE, (CARD8)(ucByte & ~(HSYNCPOL| VSYNCPOL) ));
|
||||
OUTREG8(MGAREG_MEM_MISC_WRITE, (CARD8)(ucByte & ~(HSYNCPOL| VSYNCPOL) ));
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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"
|
||||
|
||||
@ -332,6 +332,11 @@ mgaCheckSourceTexture(int tmu, PicturePtr pPict)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (pPict->repeatType != RepeatNormal) {
|
||||
DEBUG_MSG(("Unsupported repeat type %d\n", pPict->repeatType));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (pPict->repeat && ((w & (w - 1)) != 0 || (h & (h - 1)) != 0)) {
|
||||
DEBUG_MSG(("NPOT repeat unsupported (%dx%d)\n", w, h));
|
||||
return FALSE;
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
/* All drivers should typically include these */
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Resources.h"
|
||||
|
||||
/* All drivers need this */
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Resources.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "mga_reg.h"
|
||||
|
||||
@ -1138,6 +1138,20 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
|
||||
break;
|
||||
}
|
||||
|
||||
if (pMga->is_G200WB)
|
||||
{
|
||||
CARD32 dwgctl = MGADWG_RSTR | 0x00060000 | MGADWG_SHIFTZERO |
|
||||
MGADWG_BITBLT | MGADWG_BFCOL;
|
||||
WAITFIFO(7);
|
||||
OUTREG(MGAREG_DWGCTL, dwgctl);
|
||||
OUTREG(MGAREG_SGN, 0);
|
||||
OUTREG(MGAREG_AR5, 1);
|
||||
OUTREG(MGAREG_AR0, 1);
|
||||
OUTREG(MGAREG_AR3, 0);
|
||||
OUTREG(MGAREG_FXBNDRY, (1 << 16) | (1 & 0xffff));
|
||||
OUTREG(MGAREG_YDSTLEN + MGAREG_EXEC, (1 << 16) | 1);
|
||||
}
|
||||
|
||||
xf86SetLastScrnFlag(pScrn->entityList[0], pScrn->scrnIndex);
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Resources.h"
|
||||
#include "compiler.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
@ -84,6 +84,7 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
@ -111,6 +112,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -155,15 +157,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -180,24 +176,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user