COPYING | 72 ++++++++++++++++++++++++++++++++++++++++++++++++------ README | 4 --- README.sgml | 3 -- configure.ac | 2 - man/i740.man | 54 ++++++++++++++++++++++++++++++++++++++-- src/i740_driver.c | 71 +++++------------------------------------------------ src/i740_video.c | 1 7 files changed, 125 insertions(+), 82 deletions(-)
New commits: commit 947fbfd72fc81b26b0e167c4a8962e0a685b3381 Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:28 2009 +1000 i740: bump for release 1.3.2 diff --git a/configure.ac b/configure.ac index 8594e6b..21ca07e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i740], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i740) commit 3190d52077bb22bb8a8f761aabd29afa9ea14534 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 i740: change to using ABI version check diff --git a/src/i740_driver.c b/src/i740_driver.c index f76f0be..6e6b0fa 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,7 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #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 c3c32b5be1c72ec8b9e0b07ada1be888a35cb50e Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:17:33 2009 +1000 i740: fix rac/resources properly diff --git a/src/i740_driver.c b/src/i740_driver.c index b563c00..f76f0be 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,8 +52,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -432,7 +434,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { #ifndef XSERVER_LIBPCIACCESS pI740->PciTag = pciTag(pI740->PciInfo->bus, pI740->PciInfo->device, pI740->PciInfo->func); -#endif if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) return FALSE; @@ -440,7 +441,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; else pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -740,6 +741,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { +#ifndef XSERVER_LIBPCIACCESS resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, {ResShrIoBlock,0x3C0,0x3DF}, _END }; @@ -747,11 +749,13 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { {ResShrMemBlock,0xB8000,0xBFFFF}, {ResShrMemBlock,0xB0000,0xB7FFF}, _END }; - +#endif pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); +#endif } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index ad6c5f9..8cfe09a 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,7 +58,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 8f8428c28d1747b5b127307e710076022a4f7e0b Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:14:57 2009 +1000 Revert "i740: fixup for rac/resources" This reverts commit 32338c01531f26e599b69318157d86f9c1ea7d11. diff --git a/src/i740_driver.c b/src/i740_driver.c index 1f855aa..b563c00 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,6 +52,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" +#include "xf86RAC.h" #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -432,9 +434,17 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pI740->PciInfo->func); #endif + if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) + return FALSE; + if (pI740->usePIO) + pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; + else + pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; + /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; + flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { return FALSE; @@ -730,8 +740,18 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { + resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, + {ResShrIoBlock,0x3C0,0x3DF}, + _END }; + resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF}, + {ResShrMemBlock,0xB8000,0xBFFFF}, + {ResShrMemBlock,0xB0000,0xB7FFF}, + _END }; + pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); + xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); + xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index 8cfe09a..ad6c5f9 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,6 +58,7 @@ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 32338c01531f26e599b69318157d86f9c1ea7d11 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:08:35 2009 +1000 i740: fixup for rac/resources diff --git a/src/i740_driver.c b/src/i740_driver.c index b563c00..1f855aa 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,8 +52,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -434,17 +432,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pI740->PciInfo->func); #endif - if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) - return FALSE; - if (pI740->usePIO) - pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; - else - pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; - flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { return FALSE; @@ -740,18 +730,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { - resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, - {ResShrIoBlock,0x3C0,0x3DF}, - _END }; - resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF}, - {ResShrMemBlock,0xB8000,0xBFFFF}, - {ResShrMemBlock,0xB0000,0xB7FFF}, - _END }; - pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); - xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); - xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index ad6c5f9..8cfe09a 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,7 +58,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 6a2c6b45e88403d5e0d7a2ca2e4c24693809484f Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:21:35 2009 -0400 i740 1.3.1 diff --git a/configure.ac b/configure.ac index ec48aa8..8594e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i740], - 1.3.0, + 1.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i740) commit 88520119eb43d8fed27de88003171178e8305fbf Author: Adam Jackson <[email protected]> Date: Thu May 28 15:00:44 2009 -0400 Remove useless loader symbol lists. diff --git a/src/i740_driver.c b/src/i740_driver.c index f6a0688..b563c00 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -187,54 +187,6 @@ static const OptionInfoRec I740Options[] = { { -1, NULL, OPTV_NONE, {0}, FALSE} }; -static const char *vgahwSymbols[] = { - "vgaHWGetHWRec", - "vgaHWSave", /* Added */ - "vgaHWRestore", /* Added */ - "vgaHWProtect", - "vgaHWInit", - "vgaHWMapMem", - "vgaHWSetMmioFuncs", - "vgaHWGetIOBase", - "vgaHWLock", - "vgaHWUnlock", - "vgaHWFreeHWRec", - "vgaHWSaveScreen", - "vgaHWHandleColormaps", - 0 -}; - -#ifdef XFree86LOADER -static const char *fbSymbols[] = { - "fbScreenInit", - "fbPictureInit", - NULL -}; -#endif - -static const char *xaaSymbols[] = { - "XAADestroyInfoRec", - "XAACreateInfoRec", - "XAAInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86InitCursor", - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; -#endif - #ifdef XFree86LOADER static MODULESETUPPROTO(i740Setup); @@ -272,14 +224,6 @@ i740Setup(pointer module, pointer opts, int *errmaj, int *errmin) */ /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, - ramdacSymbols, vbeSymbols, - NULL); - - /* * The return value must be non-NULL on success even though there * is no TearDownProc. */ @@ -481,8 +425,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* The vgahw module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* Allocate a vgaHWRec */ if (!vgaHWGetHWRec(pScrn)) return FALSE; @@ -781,14 +723,12 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymbols("fbScreenInit","fbPictureInit", NULL); if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) { if (!xf86LoadSubModule(pScrn, "xaa")) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } if (!xf86ReturnOptValBool(pI740->Options, OPTION_SW_CURSOR, FALSE)) { @@ -796,7 +736,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* We wont be using the VGA access after the probe */ commit 17c0afa07e8adf05fe5ea51f3a69d86d3e6c5380 Author: Alan Coopersmith <[email protected]> Date: Mon May 11 21:15:29 2009 -0700 Documentation update Copy list of driver options from README to man page Remove xorgconfig from README/README.sgml Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/README b/README index 8d22ffc..ceffb0b 100644 --- a/README +++ b/README @@ -150,8 +150,6 @@ EndSection - or let xorgconfig do this for you. - However, if you have problems with auto-detection, you can specify: +o VideoRam - in kilobytes @@ -203,7 +201,7 @@ +o Daryll Strauss <[email protected]> - The X11R6.8 version of this driver originally came from XFree86 4.4 + The Xorg version of this driver originally came from XFree86 4.4 rc2. The XFree86 version of this driver was donated to The XFree86 Project diff --git a/README.sgml b/README.sgml index c22ff9d..eb20607 100644 --- a/README.sgml +++ b/README.sgml @@ -96,7 +96,6 @@ section of your xorg.conf file are: Driver "i740" EndSection </verb> -or let <tt>xorgconfig</tt> do this for you. However, if you have problems with auto-detection, you can specify: <itemize> @@ -140,7 +139,7 @@ if it is incorrectly detected. <item>Daryll Strauss <email>[email protected]</email> </itemize> -The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2. +The Xorg version of this driver originally came from XFree86 4.4 rc2. The XFree86 version of this driver was donated to The XFree86 Project by: <verb> diff --git a/man/i740.man b/man/i740.man index 8d5585c..230db43 100644 --- a/man/i740.man +++ b/man/i740.man @@ -15,16 +15,64 @@ i740 \- Intel i740 video driver .SH DESCRIPTION .B i740 is an __xservername__ driver for Intel i740 video cards. -THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B i740 -driver supports... +driver supports Intel 740 based cards. A list of cards reported to work +is provided in the README file with the driver source. .SH CONFIGURATION DETAILS Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. +.PP +The driver auto-detects all device information necessary to initialize +the card. +.PP +However, if you have problems with auto-detection, you can specify: +.TP +.BI VideoRam " - in kilobytes" +.TP +.BI DacSpeed " - in MHz" +.TP +.BI MemBase " - physical address of the linear framebuffer" +.TP +.BI IOBase " - physical address of the memory mapped IO registers" +.PP +The following driver +.B options +are supported on all chipsets: +.TP +.BI "Option \*qNoAccel\*q \*q" boolean \*q +Disable or enable 2D acceleration. Default: acceleration is enabled. +.TP +.BI "Option \*qSWCursor\*q \*q" boolean \*q +Request a software cursor (hardware is default). Default: off +.TP +.BI "Option \*qSDRAM\*q \*q" boolean \*q +Force the use of SDRAM timings. Default: off +.TP +.BI "Option \*qSGRAM\*q \*q" boolean \*q +Force the use of SGRAM timings. Default: off +.TP +.BI "Option \*qSlowRam\*q \*q" boolean \*q +Force the use of slower ram timings. Default: off +.TP +.BI "Option \*qDac6Bit\*q \*q" boolean \*q +Force the use of a 6 Bit Dac (8 Bit is the default). Default: off +.TP +.BI "Option \*qUsePIO\*q \*q" boolean \*q +Force the use of programmed IO (Memory mapped is the default). Default: off +.PP +Note: the i740 X server should automatically detect whether your card +has SGRAM or SDRAM. Use the \*qsgram\*q and \*qsdram\*q options if it is +incorrectly detected. .SH "SEE ALSO" __xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__) .SH AUTHORS -Authors include: ... +Authors include: Kevin E Martin and Daryll Strauss of Precision Insight, Inc. +.PP +The XFree86 version of this driver was donated to The XFree86 Project by +Precision Insight, Inc., Cedar Park, TX, USA +.PP +The Xorg version of this driver originally came from XFree86 4.4rc2. + commit 3ee25988bbf773fc320e5215942b6341be2503a6 Author: Alan Coopersmith <[email protected]> Date: Mon May 11 20:53:46 2009 -0700 Fill in COPYING file diff --git a/COPYING b/COPYING index 7f33cbf..51065aa 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,68 @@ -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 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +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, 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: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice (including the +next paragraph) 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, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +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. -http://lists.freedesktop.org/mailman/listinfo/xorg +************************************************************************* + +Copyright 2001 by Patrick LERDA +Portions Copyright by Stephen Blackheath + +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 Patrick LERDA not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Patrick LERDA makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL PATRICK LERDA 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 2007 George Sapountzis + +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 +THE AUTHORS OR COPYRIGHT HOLDERS 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. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
