Update xf86-video-glint to version 1.2.7
This commit is contained in:
matthieu
parent
44fc413f7a
commit
1636c55b09
@ -1,12 +1,105 @@
|
||||
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 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
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, 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:
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
Copyright 2000-2001 by Alan Hourihane, Sychdyn, North Wales, UK.
|
||||
|
||||
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 Alan Hourihane not be used in
|
||||
advertising or publicity pertaining to distribution of the software without
|
||||
specific, written prior permission. Alan Hourihane makes no representations
|
||||
about the suitability of this software for any purpose. It is provided
|
||||
"as is" without express or implied warranty.
|
||||
|
||||
ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
EVENT SHALL ALAN HOURIHANE 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 1997-2001 by Alan Hourihane, Wigan, England.
|
||||
|
||||
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 Alan Hourihane not be used in
|
||||
advertising or publicity pertaining to distribution of the software without
|
||||
specific, written prior permission. Alan Hourihane makes no representations
|
||||
about the suitability of this software for any purpose. It is provided
|
||||
"as is" without express or implied warranty.
|
||||
|
||||
ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
EVENT SHALL ALAN HOURIHANE 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.
|
||||
|
||||
Copyright 2000,2001 by Sven Luther <luther@dpt-info.u-strasbg.fr>.
|
||||
|
||||
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 Sven Luther not be used in
|
||||
advertising or publicity pertaining to distribution of the software without
|
||||
specific, written prior permission. Sven Luther makes no representations
|
||||
about the suitability of this software for any purpose. It is provided
|
||||
"as is" without express or implied warranty.
|
||||
|
||||
SVEN LUTHER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
EVENT SHALL SVEN LUTHER 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.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,407 +0,0 @@
|
||||
|
||||
GLINT State Transition Strategy
|
||||
|
||||
|
||||
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
All Rights Reserved.
|
||||
|
||||
Permission is granted to make and distribute verbatim copies
|
||||
of this document provided the copyright notice and this permission
|
||||
notice are preserved on all copies.
|
||||
|
||||
$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
|
||||
|
||||
GLINT State Transition Strategy
|
||||
|
||||
Direct Rendering requires a coordinated method of state management
|
||||
across all drivers accessing this device. This document defines the
|
||||
expected behavior of all drivers participating in direct rendering with
|
||||
this device.
|
||||
|
||||
Currently only the GMX2000 supports direct rendering.
|
||||
|
||||
|
||||
Section 1) State Transition Types
|
||||
|
||||
The direct rendering document entitled "state-mgmt.txt" gives a device
|
||||
independent overview on the different types of state transitions. This
|
||||
section gives a more detailed description of GLINT specific hardware state.
|
||||
|
||||
No context switch--no state saves or restores will be done for transitions,
|
||||
however the device can be busy executing commands from previous accesses to
|
||||
the device.
|
||||
|
||||
X context switch--the intersection of 2D and 3D state will be saved
|
||||
and restored. This is the state marked as DDX/3DClient in Appendix A.
|
||||
The device will be synced and idle after this switch.
|
||||
|
||||
3D context switch--all 3D state will be saved and restored. 3D state is
|
||||
defined as all registered owned by the 3DClient driver. See Appendix A
|
||||
for more details. The device will be synced and idle after this switch.
|
||||
|
||||
The registers owned by the DRM kernel module and submodules are not
|
||||
managed by context switches.
|
||||
|
||||
|
||||
Section 2) VT Switching and DGA Access
|
||||
|
||||
VT Switching away from the X Server or client access to the device
|
||||
framebuffer via DGA require the device to be locked away from 3D direct
|
||||
rendering accesses. The X Server will hold the lock on behalf of these
|
||||
services until access is restored.
|
||||
|
||||
|
||||
Section 3) Potential Optimizations
|
||||
|
||||
Lighten the number of registers required for context switches by using a
|
||||
mechanism to determine whether stipple or pattern registers need to be
|
||||
saved/restored. This optimization has not been done for the initial
|
||||
direct rendering infrastructure sample implementation.
|
||||
|
||||
|
||||
Appendix A: GMX2000 Register Ownership
|
||||
|
||||
driver column contains:
|
||||
DDX - DDX driver manages register
|
||||
DRM - DRM or DRM subdriver manages register
|
||||
3DClient - 3D Client Driver manges register
|
||||
DDX/3DClient, DDX/DRM, 3DClient/DRM - register access is shared
|
||||
|
||||
if the RO (read only) column is marked with a *, then no writes are
|
||||
permitted to this register, and thus no drivers own it.
|
||||
|
||||
primary and secondary columns contain the default values after
|
||||
initialization. primary is the master rasterizer, secondary is the
|
||||
slave rasterizer.
|
||||
|
||||
|
||||
Name offset primary secondary RO driver
|
||||
------------------------------------------------------------------------------
|
||||
ResetStatus o=0000 0x00000000 0x00000000 DDX/DRM
|
||||
IntEnable o=0008 0x00000000 0x00000000 DRM
|
||||
IntFlags o=0010 0x00000000 0x00000018 DRM
|
||||
InFIFOSpace o=0018 0x00000000 0x00000021 *
|
||||
OutFIFOWords o=0020 0x00000000 0x00000000 *
|
||||
DMAAddress o=0028 0x00000000 0x00000000 DRM
|
||||
DMACount o=0030 0x00000000 0x00000000 DRM
|
||||
ErrorFlags o=0038 0x00000000 0x00000002 DRM
|
||||
VClkCtl o=0040 0x00000000 0x00000000 DDX
|
||||
TestRegister o=0048 0x00000000 0x00000000 DDX
|
||||
Aperture0 o=0050 0x00000000 0x00000000 DDX
|
||||
Aperture1 o=0058 0x00000000 0x00000000 DDX
|
||||
DMAControl o=0060 0x00000000 0x00000000 DRM
|
||||
FIFODis o=0068 0x00000000 0x00000001 DDX
|
||||
LBMemoryCtl o=1000 0x00000000 0x770883ff DDX
|
||||
LBMemoryEDO o=1008 0x00000000 0x77080000 DDX
|
||||
FBMemoryCtl o=1800 0x00000000 0x63c00800 DDX
|
||||
FBModeSel o=1808 0x00000000 0x00000907 DDX
|
||||
FBGCWrMask o=1810 0x00000000 0xffffffff *
|
||||
FBGCColorLower o=1818 0x00000000 0x00828282 *
|
||||
FBTXMemCtl o=1820 0x00000000 0x00000002 DDX
|
||||
FBWrMask o=1830 0x00000000 0xffffffff *
|
||||
FBGCColorUpper o=1838 0x00000000 0x00828282 *
|
||||
VTGHLimit o=3000 0x00000000 0x000000c8 DDX
|
||||
VTGHSyncStart o=3008 0x00ffffff 0x00000006 DDX
|
||||
VTGHSyncEnd o=3010 0x00000000 0x00000016 DDX
|
||||
VTGHBlankEnd o=3018 0x00ffffff 0x00000028 DDX
|
||||
VTGVLimit o=3020 0x00000000 0x000001fb DDX
|
||||
VTGVSyncStart o=3028 0x00ffffff 0x00000004 DDX
|
||||
VTGVSyncEnd o=3030 0x00000000 0x0000000a DDX
|
||||
VTGVBlankEnd o=3038 0x00ffffff 0x0000001b DDX
|
||||
VTGHGateStart o=3040 0x00000000 0x00000027 DDX
|
||||
VTGHGateEnd o=3048 0x00ffffff 0x000000c7 DDX
|
||||
VTGVGateStart o=3050 0x00000000 0x0000001a DDX
|
||||
VTGVGateEnd o=3058 0x00ffffff 0x0000001b DDX
|
||||
VTGPolarity o=3060 0x00000000 0x000000ba DDX
|
||||
VTGFrameRowAddr o=3068 0x00ffffff 0x00000000 DDX
|
||||
VTGVLineNumber o=3070 0x00000000 0x00000079 DDX
|
||||
VTGSerialClk o=3078 0x00ffffff 0x00000002 DDX
|
||||
VTGModeCtl o=3080 0x00000000 0x00000000 DDX
|
||||
GInFIFOSpace o=0018 0x00000000 *
|
||||
GDMAAddress o=0028 0x00000000 DRM
|
||||
GDMACount o=0030 0x00000000 DRM
|
||||
GDMAControl o=0060 0x00000000 DRM
|
||||
GOutDMA o=0080 0x00000000 DRM
|
||||
GOutDMACount o=0088 0x00000000 DRM
|
||||
GResetStatus o=0800 0x00000000 DRM
|
||||
GIntEnable o=0808 0x00000000 DRM
|
||||
GIntFlags o=0810 0x00000000 DRM
|
||||
GErrorFlags o=0838 0x00000000 DRM
|
||||
GTestRegister o=0848 0x00000000 DDX
|
||||
GFIFODis o=0868 0x00000000 DDX
|
||||
GChipConfig o=0870 0x00000000 DDX
|
||||
GCSRAperture o=0878 0x00000000 DDX
|
||||
GPageTableAddr o=0c00 0x00000000 DRM
|
||||
GPageTableLength o=0c08 0x00000000 DRM
|
||||
GDelayTimer o=0c38 0x00000000 DRM
|
||||
GCommandMode o=0c40 0x00000000 DRM
|
||||
GCommandIntEnable o=0c48 0x00000000 DRM
|
||||
GCommandIntFlags o=0c50 0x00000000 DRM
|
||||
GCommandErrorFlags o=0c58 0x00000000 DRM
|
||||
GCommandStatus o=0c60 0x00000000 *
|
||||
GCommandFaultingAddr o=0c68 0x00000000 *
|
||||
GVertexFaultingAddr o=0c70 0x00000000 *
|
||||
GWriteFaultingAddr o=0c88 0x00000000 *
|
||||
GFeedbackSelectCount o=0c98 0x00000000 *
|
||||
GGammaProcessorMode o=0cb8 0x00000000 DDX
|
||||
GVGAShadow o=0d00 0x00000000 DDX
|
||||
GMultGLINTAperture o=0d08 0x00000000 DDX
|
||||
GMultGLINT1 o=0d10 0x00000000 DDX
|
||||
GMultGLINT2 o=0d18 0x00000000 DDX
|
||||
StartXDom t=0000 undefined undefined DDX/3DClient
|
||||
dXDom t=0001 undefined undefined DDX/3DClient
|
||||
StartXSub t=0002 undefined undefined DDX/3DClient
|
||||
dXSub t=0003 undefined undefined DDX/3DClient
|
||||
StartY t=0004 undefined undefined DDX/3DClient
|
||||
dY t=0005 undefined undefined DDX/3DClient
|
||||
GLINTCount t=0006 undefined undefined DDX/3DClient
|
||||
PointTable0 t=0010 undefined undefined DDX/3DClient
|
||||
PointTable1 t=0011 undefined undefined DDX/3DClient
|
||||
PointTable2 t=0012 undefined undefined DDX/3DClient
|
||||
PointTable3 t=0013 undefined undefined DDX/3DClient
|
||||
RasterizerMode t=0014 undefined undefined DDX/3DClient
|
||||
YLimits t=0015 undefined undefined DDX/3DClient
|
||||
ScanLineOwnership t=0016 0x00000001 0x00000005 DDX
|
||||
PixelSize t=0018 undefined undefined DDX/3DClient
|
||||
ScissorMode t=0030 undefined undefined DDX/3DClient
|
||||
ScissorMinXY t=0031 undefined undefined DDX/3DClient
|
||||
ScissorMaxXY t=0032 undefined undefined DDX/3DClient
|
||||
ScreenSize t=0033 undefined undefined DDX/3DClient
|
||||
AreaStippleMode t=0034 undefined undefined DDX/3DClient
|
||||
LineStippleMode t=0035 undefined undefined DDX/3DClient
|
||||
LoadLineStippleCounters t=0036 undefined undefined DDX/3DClient
|
||||
WindowOrigin t=0039 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern0 t=0040 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern1 t=0041 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern2 t=0042 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern3 t=0043 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern4 t=0044 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern5 t=0045 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern6 t=0046 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern7 t=0047 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern8 t=0048 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern9 t=0049 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern10 t=004a undefined undefined DDX/3DClient
|
||||
AreaStipplePattern11 t=004b undefined undefined DDX/3DClient
|
||||
AreaStipplePattern12 t=004c undefined undefined DDX/3DClient
|
||||
AreaStipplePattern13 t=004d undefined undefined DDX/3DClient
|
||||
AreaStipplePattern14 t=004e undefined undefined DDX/3DClient
|
||||
AreaStipplePattern15 t=004f undefined undefined DDX/3DClient
|
||||
AreaStipplePattern16 t=0050 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern17 t=0051 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern18 t=0052 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern19 t=0053 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern20 t=0054 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern21 t=0055 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern22 t=0056 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern23 t=0057 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern24 t=0058 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern25 t=0059 undefined undefined DDX/3DClient
|
||||
AreaStipplePattern26 t=005a undefined undefined DDX/3DClient
|
||||
AreaStipplePattern27 t=005b undefined undefined DDX/3DClient
|
||||
AreaStipplePattern28 t=005c undefined undefined DDX/3DClient
|
||||
AreaStipplePattern29 t=005d undefined undefined DDX/3DClient
|
||||
AreaStipplePattern30 t=005e undefined undefined DDX/3DClient
|
||||
AreaStipplePattern31 t=005f undefined undefined DDX/3DClient
|
||||
RouterMode t=0108 undefined undefined DDX/3DClient
|
||||
TextureAddressMode t=0070 undefined undefined DDX/3DClient
|
||||
SStart t=0071 undefined undefined 3DClient
|
||||
dSdx t=0072 undefined undefined 3DClient
|
||||
dSdyDom t=0073 undefined undefined 3DClient
|
||||
TStart t=0074 undefined undefined 3DClient
|
||||
dTdx t=0075 undefined undefined 3DClient
|
||||
dTdyDom t=0076 undefined undefined 3DClient
|
||||
QStart t=0077 undefined undefined 3DClient
|
||||
dQdx t=0078 undefined undefined 3DClient
|
||||
dQdyDom t=0079 undefined undefined 3DClient
|
||||
LOD t=007a undefined undefined 3DClient
|
||||
dSdy t=007b undefined undefined 3DClient
|
||||
dTdy t=007c undefined undefined 3DClient
|
||||
dQdy t=007d undefined undefined 3DClient
|
||||
TextureReadMode t=0090 undefined undefined DDX/3DClient
|
||||
TextureFormat t=0091 undefined undefined 3DClient
|
||||
TextureCacheControl t=0092 undefined undefined 3DClient
|
||||
GLINTBorderColor t=0095 undefined undefined 3DClient
|
||||
TexelLUTIndex t=0098 undefined undefined 3DClient
|
||||
TexelLUTData t=0099 undefined undefined 3DClient
|
||||
TexelLUTAddress t=009a undefined undefined 3DClient
|
||||
TexelLUTTransfer t=009b undefined undefined 3DClient
|
||||
TextureFilterMode t=009c undefined undefined 3DClient
|
||||
TextureChromaUpper t=009d undefined undefined 3DClient
|
||||
TextureChromaLower t=009e undefined undefined 3DClient
|
||||
TxBaseAddr0 t=00a0 undefined undefined 3DClient
|
||||
TxBaseAddr1 t=00a1 undefined undefined 3DClient
|
||||
TxBaseAddr2 t=00a2 undefined undefined 3DClient
|
||||
TxBaseAddr3 t=00a3 undefined undefined 3DClient
|
||||
TxBaseAddr4 t=00a4 undefined undefined 3DClient
|
||||
TxBaseAddr5 t=00a5 undefined undefined 3DClient
|
||||
TxBaseAddr6 t=00a6 undefined undefined 3DClient
|
||||
TxBaseAddr7 t=00a7 undefined undefined 3DClient
|
||||
TxBaseAddr8 t=00a8 undefined undefined 3DClient
|
||||
TxBaseAddr9 t=00a9 undefined undefined 3DClient
|
||||
TxBaseAddr10 t=00aa undefined undefined 3DClient
|
||||
TxBaseAddr11 t=00ab undefined undefined 3DClient
|
||||
TexelLUT0 t=01d0 undefined undefined 3DClient
|
||||
TexelLUT1 t=01d1 undefined undefined 3DClient
|
||||
TexelLUT2 t=01d2 undefined undefined 3DClient
|
||||
TexelLUT3 t=01d3 undefined undefined 3DClient
|
||||
TexelLUT4 t=01d4 undefined undefined 3DClient
|
||||
TexelLUT5 t=01d5 undefined undefined 3DClient
|
||||
TexelLUT6 t=01d6 undefined undefined 3DClient
|
||||
TexelLUT7 t=01d7 undefined undefined 3DClient
|
||||
TexelLUT8 t=01d8 undefined undefined 3DClient
|
||||
TexelLUT9 t=01d9 undefined undefined 3DClient
|
||||
TexelLUT10 t=01da undefined undefined 3DClient
|
||||
TexelLUT11 t=01db undefined undefined 3DClient
|
||||
TexelLUT12 t=01dc undefined undefined 3DClient
|
||||
TexelLUT13 t=01dd undefined undefined 3DClient
|
||||
TexelLUT14 t=01de undefined undefined 3DClient
|
||||
TexelLUT15 t=01df undefined undefined 3DClient
|
||||
Texel0 t=00c0 undefined undefined 3DClient
|
||||
Texel1 t=00c1 undefined undefined 3DClient
|
||||
Texel2 t=00c2 undefined undefined 3DClient
|
||||
Texel3 t=00c3 undefined undefined 3DClient
|
||||
Texel4 t=00c4 undefined undefined 3DClient
|
||||
Texel5 t=00c5 undefined undefined 3DClient
|
||||
Texel6 t=00c6 undefined undefined 3DClient
|
||||
Texel7 t=00c7 undefined undefined 3DClient
|
||||
Interp0 t=00c8 undefined undefined 3DClient
|
||||
Interp1 t=00c9 undefined undefined 3DClient
|
||||
Interp2 t=00ca undefined undefined 3DClient
|
||||
Interp3 t=00cb undefined undefined 3DClient
|
||||
Interp4 t=00cc undefined undefined 3DClient
|
||||
TextureFilter t=00cd undefined undefined 3DClient
|
||||
TextureColorMode t=00d0 undefined undefined DDX/3DClient
|
||||
TextureEnvColor t=00d1 undefined undefined 3DClient
|
||||
FogMode t=00d2 undefined undefined DDX/3DClient
|
||||
FogColor t=00d3 undefined undefined 3DClient
|
||||
FStart t=00d4 undefined undefined 3DClient
|
||||
dFdx t=00d5 undefined undefined 3DClient
|
||||
dFdyDom t=00d6 undefined undefined 3DClient
|
||||
KsStart t=00d9 undefined undefined 3DClient
|
||||
dKsdx t=00da undefined undefined 3DClient
|
||||
dKsdyDom t=00db undefined undefined 3DClient
|
||||
KdStart t=00dc undefined undefined 3DClient
|
||||
dKdStart t=00dd undefined undefined 3DClient
|
||||
dKddyDom t=00de undefined undefined 3DClient
|
||||
RStart t=00f0 undefined undefined 3DClient
|
||||
dRdx t=00f1 undefined undefined 3DClient
|
||||
dRdyDom t=00f2 undefined undefined 3DClient
|
||||
GStart t=00f3 undefined undefined 3DClient
|
||||
dGdx t=00f4 undefined undefined 3DClient
|
||||
dGdyDom t=00f5 undefined undefined 3DClient
|
||||
BStart t=00f6 undefined undefined 3DClient
|
||||
dBdx t=00f7 undefined undefined 3DClient
|
||||
dBdyDom t=00f8 undefined undefined 3DClient
|
||||
AStart t=00f9 undefined undefined 3DClient
|
||||
dAdx t=00fa undefined undefined 3DClient
|
||||
dAdyDom t=00fb undefined undefined 3DClient
|
||||
ColorDDAMode t=00fc undefined undefined DDX/3DClient
|
||||
ConstantColor t=00fd undefined undefined 3DClient
|
||||
GLINTColor t=00fe undefined undefined DDX/3DClient
|
||||
AlphaTestMode t=0100 undefined undefined DDX/3DClient
|
||||
AntialiasMode t=0101 undefined undefined DDX/3DClient
|
||||
AlphaBlendMode t=0102 undefined undefined DDX/3DClient
|
||||
ChromaUpper t=01e1 undefined undefined 3DClient
|
||||
ChromaLower t=01e2 undefined undefined 3DClient
|
||||
ChromaTestMode t=01e3 undefined undefined 3DClient
|
||||
DitherMode t=0103 undefined undefined DDX/3DClient
|
||||
FBSoftwareWriteMask t=0104 undefined undefined DDX/3DClient
|
||||
LogicalOpMode t=0105 undefined undefined DDX/3DClient
|
||||
FBWriteData t=0106 undefined undefined DDX/3DClient
|
||||
LBReadMode t=0110 undefined undefined DDX/3DClient
|
||||
Partial Product bit 0-5 need by 3DClient
|
||||
LBReadFormat t=0111 set by DDX set by DDX DDX
|
||||
LBSourceOffset t=0112 undefined undefined DDX/3DClient
|
||||
LBStencil t=0115 undefined undefined *
|
||||
LBDepth t=0116 undefined undefined *
|
||||
LBWindowBase t=0117 undefined undefined DDX/3DClient
|
||||
LBWriteMode t=0118 undefined undefined DDX/3DClient
|
||||
LBWriteFormat t=0119 set by DDX set by DDX DDX
|
||||
TextureDownloadOffset t=011e undefined undefined DDX/3DClient
|
||||
LBWindowOffset t=011f undefined undefined DDX/3DClient
|
||||
GLINTWindow t=0130 undefined undefined DDX/3DClient
|
||||
StencilMode t=0131 undefined undefined DDX/3DClient
|
||||
StencilData t=0132 undefined undefined 3DClient
|
||||
GLINTStencil t=0133 undefined undefined 3DClient
|
||||
DepthMode t=0134 undefined undefined DDX/3DClient
|
||||
GLINTDepth t=0135 undefined undefined DDX/3DClient
|
||||
ZStartU t=0136 undefined undefined 3DClient
|
||||
ZStartL t=0137 undefined undefined 3DClient
|
||||
dZdxU t=0138 undefined undefined 3DClient
|
||||
dZdxL t=0139 undefined undefined 3DClient
|
||||
dZdyDomU t=013a undefined undefined 3DClient
|
||||
dZdyDomL t=013b undefined undefined 3DClient
|
||||
FastClearDepth t=013c undefined undefined 3DClient
|
||||
FBReadMode t=0150 set by DDX set by DDX DDX/3DClient
|
||||
Partial Product bit 0-5 need by 3DClient
|
||||
LBReadFormat t=0111 set by DDX set by DDX DDX
|
||||
FBSourceOffset t=0151 undefined undefined DDX/3DClient
|
||||
FBPixelOffset t=0152 undefined undefined DDX/3DClient
|
||||
FBWindowBase t=0156 undefined undefined DDX/3DClient
|
||||
FBWriteMode t=0157 undefined undefined DDX/3DClient
|
||||
FBHardwareWriteMask t=0158 undefined undefined DDX/3DClient
|
||||
FBBlockColor t=0159 undefined undefined DDX/3DClient
|
||||
PatternRamMode t=015f undefined undefined DDX/3DClient
|
||||
PatternRamData0 t=0160 undefined undefined DDX/3DClient
|
||||
PatternRamData1 t=0161 undefined undefined DDX/3DClient
|
||||
PatternRamData2 t=0162 undefined undefined DDX/3DClient
|
||||
PatternRamData3 t=0163 undefined undefined DDX/3DClient
|
||||
PatternRamData4 t=0164 undefined undefined DDX/3DClient
|
||||
PatternRamData5 t=0165 undefined undefined DDX/3DClient
|
||||
PatternRamData6 t=0166 undefined undefined DDX/3DClient
|
||||
PatternRamData7 t=0167 undefined undefined DDX/3DClient
|
||||
PatternRamData8 t=0168 undefined undefined DDX/3DClient
|
||||
PatternRamData9 t=0169 undefined undefined DDX/3DClient
|
||||
PatternRamData10 t=016a undefined undefined DDX/3DClient
|
||||
PatternRamData11 t=016b undefined undefined DDX/3DClient
|
||||
PatternRamData12 t=016c undefined undefined DDX/3DClient
|
||||
PatternRamData13 t=016d undefined undefined DDX/3DClient
|
||||
PatternRamData14 t=016e undefined undefined DDX/3DClient
|
||||
PatternRamData15 t=016f undefined undefined DDX/3DClient
|
||||
PatternRamData16 t=0170 undefined undefined DDX/3DClient
|
||||
PatternRamData17 t=0171 undefined undefined DDX/3DClient
|
||||
PatternRamData18 t=0172 undefined undefined DDX/3DClient
|
||||
PatternRamData19 t=0173 undefined undefined DDX/3DClient
|
||||
PatternRamData20 t=0174 undefined undefined DDX/3DClient
|
||||
PatternRamData21 t=0175 undefined undefined DDX/3DClient
|
||||
PatternRamData22 t=0176 undefined undefined DDX/3DClient
|
||||
PatternRamData23 t=0177 undefined undefined DDX/3DClient
|
||||
PatternRamData24 t=0178 undefined undefined DDX/3DClient
|
||||
PatternRamData25 t=0179 undefined undefined DDX/3DClient
|
||||
PatternRamData26 t=017a undefined undefined DDX/3DClient
|
||||
PatternRamData27 t=017b undefined undefined DDX/3DClient
|
||||
PatternRamData28 t=017c undefined undefined DDX/3DClient
|
||||
PatternRamData29 t=017d undefined undefined DDX/3DClient
|
||||
PatternRamData30 t=017e undefined undefined DDX/3DClient
|
||||
PatternRamData31 t=017f undefined undefined DDX/3DClient
|
||||
FBBlockColorU t=018d undefined undefined DDX/3DClient
|
||||
FBBlockColorL t=018e undefined undefined DDX/3DClient
|
||||
FilterMode t=0180 undefined undefined DDX/3DClient
|
||||
StatisticMode t=0181 undefined undefined DDX/3DClient
|
||||
MinRegion t=0182 undefined undefined 3DClient
|
||||
MaxRegion t=0183 undefined undefined 3DClient
|
||||
KsRStart t=0190 undefined undefined 3DClient
|
||||
dKsRdx t=0191 undefined undefined 3DClient
|
||||
dKsRdyDom t=0192 undefined undefined 3DClient
|
||||
KsGStart t=0193 undefined undefined 3DClient
|
||||
dKsGdx t=0194 undefined undefined 3DClient
|
||||
dKsGdyDom t=0195 undefined undefined 3DClient
|
||||
KsBStart t=0196 undefined undefined 3DClient
|
||||
dKsBdx t=0197 undefined undefined 3DClient
|
||||
dKsBdyDom t=0198 undefined undefined 3DClient
|
||||
KdRStart t=01a0 undefined undefined 3DClient
|
||||
dKdRdx t=01a1 undefined undefined 3DClient
|
||||
dKdRdyDom t=01a2 undefined undefined 3DClient
|
||||
KdGStart t=01a3 undefined undefined 3DClient
|
||||
dKdGdx t=01a4 undefined undefined 3DClient
|
||||
dKdGdyDom t=01a5 undefined undefined 3DClient
|
||||
KdBStart t=01a6 undefined undefined 3DClient
|
||||
dKdBdx t=01a7 undefined undefined 3DClient
|
||||
dKdBdyDom t=01a8 undefined undefined 3DClient
|
||||
|
||||
All Gamma State is undefined and owned by 3DClient driver except for:
|
||||
|
||||
BroadcastMask o=026f 0x00000003 DDX/3DClient
|
||||
|
||||
All TI RAMDAC State is owned by DDX driver.
|
||||
291
driver/xf86-video-glint/INSTALL
Normal file
291
driver/xf86-video-glint/INSTALL
Normal file
@ -0,0 +1,291 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
|
||||
5. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX'.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them.
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *Note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
|
||||
@ -18,7 +18,17 @@
|
||||
# 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.
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
EXTRA_DIST = DRI.txt README.pm3
|
||||
EXTRA_DIST = README.pm3
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
@ -42,9 +42,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = .
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -57,7 +57,7 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog config.guess \
|
||||
$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -104,59 +105,63 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BASE_CFLAGS = @BASE_CFLAGS@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DRIVER_NAME = @DRIVER_NAME@
|
||||
DRI_CFLAGS = @DRI_CFLAGS@
|
||||
DRI_FALSE = @DRI_FALSE@
|
||||
DRI_LIBS = @DRI_LIBS@
|
||||
DRI_TRUE = @DRI_TRUE@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FGREP = @FGREP@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
@ -171,21 +176,21 @@ RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRICT_CFLAGS = @STRICT_CFLAGS@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
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_F77 = @ac_ct_F77@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@ -227,9 +232,9 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
EXTRA_DIST = DRI.txt README.pm3
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
EXTRA_DIST = README.pm3
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -471,6 +476,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -597,6 +605,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-recursive
|
||||
|
||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||
@ -652,7 +661,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||
check-am clean clean-generic clean-libtool clean-recursive \
|
||||
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
||||
dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
@ -664,6 +673,16 @@ uninstall-info: uninstall-info-recursive
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am
|
||||
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -2,7 +2,7 @@ xf86-video-glint - GLINT/Permedia video driver for the Xorg X server
|
||||
|
||||
Please submit bugs & patches to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
|
||||
|
||||
STATUS as of Tue, 8 May 2001 19:01:39 +0200
|
||||
|
||||
Working :
|
||||
|
||||
10974
driver/xf86-video-glint/aclocal.m4
vendored
10974
driver/xf86-video-glint/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -2,9 +2,6 @@
|
||||
|
||||
#include "xorg-server.h"
|
||||
|
||||
/* Have cfb8_32 support */
|
||||
#undef HAVE_CFB8_32
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
@ -38,6 +35,10 @@
|
||||
/* xextproto 7.1 available */
|
||||
#undef HAVE_XEXTPROTO_71
|
||||
|
||||
/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||
*/
|
||||
#undef LT_OBJDIR
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
@ -70,9 +71,3 @@
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Enable DRI driver support */
|
||||
#undef XF86DRI
|
||||
|
||||
/* Enable developmental DRI driver support */
|
||||
#undef XF86DRI_DEVEL
|
||||
|
||||
30653
driver/xf86-video-glint/configure
vendored
30653
driver/xf86-video-glint/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -20,52 +20,51 @@
|
||||
#
|
||||
# Process this file with autoconf to produce a configure script
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xf86-video-glint],
|
||||
1.2.4,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-glint)
|
||||
|
||||
[1.2.7],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint],
|
||||
[xf86-video-glint])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Checks for programs.
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
# Initialize libtool
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_CC
|
||||
|
||||
AH_TOP([#include "xorg-server.h"])
|
||||
|
||||
# Define a configure option for an alternate module directory
|
||||
AC_ARG_WITH(xorg-module-dir,
|
||||
AC_HELP_STRING([--with-xorg-module-dir=DIR],
|
||||
AS_HELP_STRING([--with-xorg-module-dir=DIR],
|
||||
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
|
||||
[moduledir="$withval"],
|
||||
[moduledir="$libdir/xorg/modules"])
|
||||
|
||||
AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
|
||||
[Disable DRI support [[default=auto]]]),
|
||||
[DRI="$enableval"],
|
||||
[DRI=auto])
|
||||
|
||||
# Checks for extensions
|
||||
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
|
||||
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
|
||||
# Store the list of server defined optional extensions in REQUIRED_MODULES
|
||||
XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
||||
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
|
||||
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
|
||||
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
|
||||
# Obtain compiler/linker options for the driver dependencies
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
|
||||
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
HAVE_XEXTPROTO_71="no")
|
||||
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
|
||||
|
||||
# Checks for libraries.
|
||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
@ -73,40 +72,8 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
|
||||
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||||
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
|
||||
[#include "xorg-server.h"])
|
||||
AC_CHECK_HEADER(cfb8_32.h,[AC_DEFINE(HAVE_CFB8_32, 1, [Have cfb8_32 support])],[])
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
|
||||
if test "$DRI" != no; then
|
||||
AC_CHECK_FILE([${sdkdir}/dri.h],
|
||||
[have_dri_h="yes"], [have_dri_h="no"])
|
||||
AC_CHECK_FILE([${sdkdir}/sarea.h],
|
||||
[have_sarea_h="yes"], [have_sarea_h="no"])
|
||||
AC_CHECK_FILE([${sdkdir}/dristruct.h],
|
||||
[have_dristruct_h="yes"], [have_dristruct_h="no"])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether to include DRI support])
|
||||
if test x$DRI = xauto; then
|
||||
if test "$have_dri_h" = yes -a \
|
||||
"$have_sarea_h" = yes -a \
|
||||
"$have_dristruct_h" = yes; then
|
||||
DRI="yes"
|
||||
else
|
||||
DRI="no"
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT([$DRI])
|
||||
|
||||
AM_CONDITIONAL(DRI, test x$DRI = xyes)
|
||||
if test "$DRI" = yes; then
|
||||
PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
|
||||
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
|
||||
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
|
||||
fi
|
||||
|
||||
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
|
||||
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
|
||||
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
|
||||
@ -114,18 +81,14 @@ fi
|
||||
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
|
||||
|
||||
|
||||
AC_SUBST([DRI_CFLAGS])
|
||||
AC_SUBST([XORG_CFLAGS])
|
||||
AC_SUBST([moduledir])
|
||||
|
||||
DRIVER_NAME=glint
|
||||
AC_SUBST([DRIVER_NAME])
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,27 +1,24 @@
|
||||
#
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# 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 copyright holders 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 copyright holders.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
drivermandir = $(DRIVER_MAN_DIR)
|
||||
@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
|
||||
|
||||
CLEANFILES = $(driverman_DATA)
|
||||
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(DRIVER_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
@ -16,28 +16,25 @@
|
||||
|
||||
#
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# 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 copyright holders 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 copyright holders.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
srcdir = @srcdir@
|
||||
@ -49,9 +46,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -96,59 +94,63 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BASE_CFLAGS = @BASE_CFLAGS@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DRIVER_NAME = @DRIVER_NAME@
|
||||
DRI_CFLAGS = @DRI_CFLAGS@
|
||||
DRI_FALSE = @DRI_FALSE@
|
||||
DRI_LIBS = @DRI_LIBS@
|
||||
DRI_TRUE = @DRI_TRUE@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FGREP = @FGREP@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
@ -160,24 +162,24 @@ PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = sed
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRICT_CFLAGS = @STRICT_CFLAGS@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
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_F77 = @ac_ct_F77@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@ -225,21 +227,7 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
|
||||
EXTRA_DIST = @DRIVER_NAME@.man
|
||||
CLEANFILES = $(driverman_DATA)
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
||||
all: all-am
|
||||
|
||||
@ -254,9 +242,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu man/Makefile
|
||||
$(AUTOMAKE) --foreign man/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@ -426,7 +414,7 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
|
||||
|
||||
|
||||
.man.$(DRIVER_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.5 2001/12/17 20:52:32 dawes Exp $
|
||||
.\" shorthand for double quote that works everywhere.
|
||||
.ds q \N'34'
|
||||
.TH GLINT __drivermansuffix__ __vendorversion__
|
||||
@ -102,6 +101,30 @@ acceleration in general, but disables it for some special cases. Default: off.
|
||||
.TP
|
||||
.BI "Option \*qFireGL3000\*q \*q" boolean \*q
|
||||
If you have a card of the same name, turn this on. Default: off.
|
||||
.TP
|
||||
The Permedia 2 xv driver supports some additional options:
|
||||
.TP
|
||||
.BI "Option \*qDevice\*q \*q" string \*q
|
||||
A path to the Permedia 2 kernel driver. This is required for Xv support.
|
||||
.TP
|
||||
.BI "Option \*qInputBuffers\*q \*q" integer \*q
|
||||
Sets the number of buffers for incoming data. Minimum of 1, max of 2.
|
||||
.TP
|
||||
.BI "Option \*qInputFramesPerSec\*q \*q" integer \*q
|
||||
Expected frames per second for incoming data.
|
||||
.TP
|
||||
.BI "Option \*qInputEncoding\*q \*q" string \*q
|
||||
The encoding that input data will have.
|
||||
.TP
|
||||
.BI "Option \*qOutputBuffers\*q \*q" integer \*q
|
||||
This should probably set the number of buffers for outgoing data. It actually
|
||||
does nothing.
|
||||
.TP
|
||||
.BI "Option \*qOutputFramesPerSec\*q \*q" integer \*q
|
||||
Expected frames per second for outgoing data.
|
||||
.TP
|
||||
.BI "Option \*qOutputEncoding\*q \*q" string \*q
|
||||
The encoding to put output data in.
|
||||
.SH "SEE ALSO"
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
|
||||
.SH AUTHORS
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
* glintOutIBMRGBIndReg() and glintInIBMRGBIndReg() are used to access
|
||||
* the indirect IBM RAMDAC registers only.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.5 1998/08/29 14:34:34 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -33,7 +32,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "IBM.h"
|
||||
|
||||
@ -23,13 +23,12 @@
|
||||
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
|
||||
# _ladir passes a dummy rpath to libtool so the thing will actually link
|
||||
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
||||
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
|
||||
AM_CFLAGS = @XORG_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
|
||||
glint_drv_la_LTLIBRARIES = glint_drv.la
|
||||
glint_drv_la_LDFLAGS = -module -avoid-version
|
||||
glint_drv_ladir = @moduledir@/drivers
|
||||
|
||||
glint_drv_la_SOURCES = \
|
||||
glint_common.h \
|
||||
glint_dga.c \
|
||||
glint_driver.c \
|
||||
glint.h \
|
||||
@ -53,10 +52,3 @@ glint_drv_la_SOURCES = \
|
||||
TIramdac.c \
|
||||
tx_accel.c \
|
||||
tx_dac.c
|
||||
|
||||
if DRI
|
||||
glint_drv_la_SOURCES += \
|
||||
glint_dri.c \
|
||||
glint_dri.h \
|
||||
glint_dripriv.h
|
||||
endif
|
||||
|
||||
@ -43,9 +43,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
|
||||
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
@ -56,11 +56,6 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@DRI_TRUE@am__append_1 = \
|
||||
@DRI_TRUE@ glint_dri.c \
|
||||
@DRI_TRUE@ glint_dri.h \
|
||||
@DRI_TRUE@ glint_dripriv.h
|
||||
|
||||
subdir = src
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -80,19 +75,11 @@ am__installdirs = "$(DESTDIR)$(glint_drv_ladir)"
|
||||
glint_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(glint_drv_la_LTLIBRARIES)
|
||||
glint_drv_la_LIBADD =
|
||||
am__glint_drv_la_SOURCES_DIST = glint_common.h glint_dga.c \
|
||||
glint_driver.c glint.h glintpcirename.h glint_regs.h \
|
||||
glint_shadow.c IBMramdac.c pm2_accel.c pm2_dac.c pm2ramdac.c \
|
||||
pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c pm3_dac.c \
|
||||
pm3_regs.h pm3_video.c pm_accel.c pm_dac.c sx_accel.c \
|
||||
TIramdac.c tx_accel.c tx_dac.c glint_dri.c glint_dri.h \
|
||||
glint_dripriv.h
|
||||
@DRI_TRUE@am__objects_1 = glint_dri.lo
|
||||
am_glint_drv_la_OBJECTS = glint_dga.lo glint_driver.lo glint_shadow.lo \
|
||||
IBMramdac.lo pm2_accel.lo pm2_dac.lo pm2ramdac.lo pm2v_dac.lo \
|
||||
pm2_video.lo pm2vramdac.lo pm3_accel.lo pm3_dac.lo \
|
||||
pm3_video.lo pm_accel.lo pm_dac.lo sx_accel.lo TIramdac.lo \
|
||||
tx_accel.lo tx_dac.lo $(am__objects_1)
|
||||
tx_accel.lo tx_dac.lo
|
||||
glint_drv_la_OBJECTS = $(am_glint_drv_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
@ -106,7 +93,7 @@ CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(glint_drv_la_SOURCES)
|
||||
DIST_SOURCES = $(am__glint_drv_la_SOURCES_DIST)
|
||||
DIST_SOURCES = $(glint_drv_la_SOURCES)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -116,6 +103,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AR = @AR@
|
||||
@ -123,59 +111,63 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BASE_CFLAGS = @BASE_CFLAGS@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
DRIVER_NAME = @DRIVER_NAME@
|
||||
DRI_CFLAGS = @DRI_CFLAGS@
|
||||
DRI_FALSE = @DRI_FALSE@
|
||||
DRI_LIBS = @DRI_LIBS@
|
||||
DRI_TRUE = @DRI_TRUE@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FGREP = @FGREP@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
|
||||
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
@ -190,21 +182,21 @@ RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRICT_CFLAGS = @STRICT_CFLAGS@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
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_F77 = @ac_ct_F77@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@ -252,16 +244,35 @@ target_alias = @target_alias@
|
||||
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
|
||||
# _ladir passes a dummy rpath to libtool so the thing will actually link
|
||||
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
||||
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
|
||||
AM_CFLAGS = @XORG_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
|
||||
glint_drv_la_LTLIBRARIES = glint_drv.la
|
||||
glint_drv_la_LDFLAGS = -module -avoid-version
|
||||
glint_drv_ladir = @moduledir@/drivers
|
||||
glint_drv_la_SOURCES = glint_common.h glint_dga.c glint_driver.c \
|
||||
glint.h glintpcirename.h glint_regs.h glint_shadow.c \
|
||||
IBMramdac.c pm2_accel.c pm2_dac.c pm2ramdac.c pm2v_dac.c \
|
||||
pm2_video.c pm2vramdac.c pm3_accel.c pm3_dac.c pm3_regs.h \
|
||||
pm3_video.c pm_accel.c pm_dac.c sx_accel.c TIramdac.c \
|
||||
tx_accel.c tx_dac.c $(am__append_1)
|
||||
glint_drv_la_SOURCES = \
|
||||
glint_dga.c \
|
||||
glint_driver.c \
|
||||
glint.h \
|
||||
glintpcirename.h \
|
||||
glint_regs.h \
|
||||
glint_shadow.c \
|
||||
IBMramdac.c \
|
||||
pm2_accel.c \
|
||||
pm2_dac.c \
|
||||
pm2ramdac.c \
|
||||
pm2v_dac.c \
|
||||
pm2_video.c \
|
||||
pm2vramdac.c \
|
||||
pm3_accel.c \
|
||||
pm3_dac.c \
|
||||
pm3_regs.h \
|
||||
pm3_video.c \
|
||||
pm_accel.c \
|
||||
pm_dac.c \
|
||||
sx_accel.c \
|
||||
TIramdac.c \
|
||||
tx_accel.c \
|
||||
tx_dac.c
|
||||
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -275,9 +286,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu src/Makefile
|
||||
$(AUTOMAKE) --foreign src/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@ -334,7 +345,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IBMramdac.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIramdac.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glint_dga.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glint_dri.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glint_driver.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glint_shadow.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm2_accel.Plo@am__quote@
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
* glintOutTIIndReg() and glintInTIIndReg() are used to access
|
||||
* the indirect TI RAMDAC registers only.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.4 2001/01/31 16:14:52 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -36,7 +35,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "TI.h"
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.58tsi Exp $ */
|
||||
/*
|
||||
* Copyright 1997-2001 by Alan Hourihane <alanh@fairlite.demon.co.uk>
|
||||
*
|
||||
@ -42,14 +41,6 @@
|
||||
#include "xf86i2c.h"
|
||||
#include "xf86DDC.h"
|
||||
#include "xf86xv.h"
|
||||
#ifdef XF86DRI_DEVEL
|
||||
#include "xf86drm.h"
|
||||
#include "sarea.h"
|
||||
#define _XF86DRI_SERVER_
|
||||
#include "dri.h"
|
||||
#include "GL/glxint.h"
|
||||
#include "glint_dripriv.h"
|
||||
#endif
|
||||
|
||||
#define GLINT_MAX_MULTI_DEVICES 2
|
||||
|
||||
@ -174,21 +165,6 @@ typedef struct {
|
||||
void (*VideoTimerCallback)(ScrnInfoPtr, Time);
|
||||
XF86VideoAdaptorPtr adaptor;
|
||||
int videoKey;
|
||||
#ifdef XF86DRI_DEVEL
|
||||
Bool directRenderingEnabled;
|
||||
Bool PCIMode;
|
||||
DRIInfoPtr pDRIInfo;
|
||||
int drmSubFD;
|
||||
drmBufMapPtr drmBufs; /* Map of DMA buffers */
|
||||
drmRegion agp;
|
||||
drmRegion buffers;
|
||||
int numVisualConfigs;
|
||||
__GLXvisualConfig* pVisualConfigs;
|
||||
GLINTConfigPrivPtr pVisualConfigsPriv;
|
||||
GLINTRegRec DRContextRegs;
|
||||
int DRIctx;
|
||||
unsigned char *buf2D;
|
||||
#endif
|
||||
OptionInfoPtr Options;
|
||||
Bool PM3_UsingSGRAM;
|
||||
} GLINTRec, *GLINTPtr;
|
||||
@ -200,29 +176,29 @@ typedef struct {
|
||||
#define PCI_VENDOR_TI_CHIP_PERMEDIA \
|
||||
((PCI_VENDOR_TI << 16) | PCI_CHIP_TI_PERMEDIA)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA2 \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA2)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2V)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA2V)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA3 \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA3)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA3)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA4 \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA4)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA4)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_R4 \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_R4)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_R4)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_300SX \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_300SX)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_300SX)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_500TX \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_500TX)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_500TX)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_MX \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_MX)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_MX)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_GAMMA \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_GAMMA)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_GAMMA)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_GAMMA2 \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_GAMMA2)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_GAMMA2)
|
||||
#define PCI_VENDOR_3DLABS_CHIP_DELTA \
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_DELTA)
|
||||
((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_DELTA)
|
||||
|
||||
/* Prototypes */
|
||||
|
||||
@ -346,16 +322,6 @@ extern int partprodPermedia[];
|
||||
|
||||
Bool GLINTDGAInit(ScreenPtr pScreen);
|
||||
|
||||
Bool GLINTDRIScreenInit(ScreenPtr pScreen);
|
||||
Bool GLINTDRIFinishScreenInit(ScreenPtr pScreen);
|
||||
void GLINTDRICloseScreen(ScreenPtr pScreen);
|
||||
Bool GLINTInitGLXVisuals(ScreenPtr pScreen);
|
||||
void GLINTDRIWakeupHandler(ScreenPtr pScreen);
|
||||
void GLINTDRIBlockHandler(ScreenPtr pScreen);
|
||||
void GLINTDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index);
|
||||
void GLINTDRIMoveBuffers(WindowPtr pWin, DDXPointRec ptOldOrg,
|
||||
RegionPtr prgnSrc, CARD32 index);
|
||||
|
||||
void GLINT_VERB_WRITE_REG(GLINTPtr, CARD32 v, int r, char *file, int line);
|
||||
CARD32 GLINT_VERB_READ_REG(GLINTPtr, CARD32 r, char *file, int line);
|
||||
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
/* glint_common.h -- common header definitions for Gamma 2D/3D/DRM suite
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Converted to common header format:
|
||||
* Jens Owen <jens@tungstengraphics.com>
|
||||
*
|
||||
* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.2 2003/04/03 16:52:18 dawes Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _GLINT_COMMON_H_
|
||||
#define _GLINT_COMMON_H_
|
||||
|
||||
/*
|
||||
* WARNING: If you change any of these defines, make sure to change
|
||||
* the kernel include file as well (gamma_drm.h)
|
||||
*/
|
||||
|
||||
/* Driver specific DRM command indices
|
||||
* NOTE: these are not OS specific, but they are driver specific
|
||||
*/
|
||||
#define DRM_GAMMA_INIT 0x00
|
||||
#define DRM_GAMMA_COPY 0x01
|
||||
|
||||
typedef struct {
|
||||
enum {
|
||||
GAMMA_INIT_DMA = 0x01,
|
||||
GAMMA_CLEANUP_DMA = 0x02
|
||||
} func;
|
||||
int sarea_priv_offset;
|
||||
int pcimode;
|
||||
unsigned int mmio0;
|
||||
unsigned int mmio1;
|
||||
unsigned int mmio2;
|
||||
unsigned int mmio3;
|
||||
unsigned int buffers_offset;
|
||||
int num_rast;
|
||||
} drmGAMMAInit;
|
||||
|
||||
extern int drmGAMMAInitDMA( int fd, drmGAMMAInit *info );
|
||||
extern int drmGAMMACleanupDMA( int fd );
|
||||
|
||||
#endif
|
||||
@ -21,7 +21,6 @@
|
||||
*
|
||||
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.3 2001/04/10 20:33:30 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -30,7 +29,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xaa.h"
|
||||
#include "xaalocal.h"
|
||||
#include "glint.h"
|
||||
@ -75,15 +73,15 @@ GLINTDGAInit(ScreenPtr pScreen)
|
||||
while(pMode) {
|
||||
|
||||
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
|
||||
newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
|
||||
newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
|
||||
oneMore = TRUE;
|
||||
} else {
|
||||
newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
|
||||
newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
|
||||
oneMore = FALSE;
|
||||
}
|
||||
|
||||
if(!newmodes) {
|
||||
xfree(modes);
|
||||
free(modes);
|
||||
return FALSE;
|
||||
}
|
||||
modes = newmodes;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,123 +0,0 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.7 2002/10/30 12:52:16 alanh Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, 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, 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 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.
|
||||
|
||||
**************************************************************************/
|
||||
|
||||
/*
|
||||
* Author:
|
||||
* Jens Owen <jens@tungstengraphics.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _GLINT_DRI_H_
|
||||
#define _GLINT_DRI_H_
|
||||
|
||||
#include "xf86drm.h"
|
||||
#include "glint_common.h"
|
||||
|
||||
typedef struct {
|
||||
unsigned int GDeltaMode;
|
||||
unsigned int GDepthMode;
|
||||
unsigned int GGeometryMode;
|
||||
unsigned int GTransformMode;
|
||||
} GAMMAContextRegionRec, *GAMMAContextRegionPtr;
|
||||
|
||||
typedef struct {
|
||||
unsigned char next, prev; /* indices to form a circular LRU */
|
||||
unsigned char in_use; /* owned by a client, or free? */
|
||||
int age; /* tracked by clients to update local LRU's */
|
||||
} GAMMATextureRegionRec, *GAMMATextureRegionPtr;
|
||||
|
||||
typedef struct {
|
||||
GAMMAContextRegionRec context_state;
|
||||
|
||||
unsigned int dirty;
|
||||
|
||||
/* Maintain an LRU of contiguous regions of texture space. If
|
||||
* you think you own a region of texture memory, and it has an
|
||||
* age different to the one you set, then you are mistaken and
|
||||
* it has been stolen by another client. If global texAge
|
||||
* hasn't changed, there is no need to walk the list.
|
||||
*
|
||||
* These regions can be used as a proxy for the fine-grained
|
||||
* texture information of other clients - by maintaining them
|
||||
* in the same lru which is used to age their own textures,
|
||||
* clients have an approximate lru for the whole of global
|
||||
* texture space, and can make informed decisions as to which
|
||||
* areas to kick out. There is no need to choose whether to
|
||||
* kick out your own texture or someone else's - simply eject
|
||||
* them all in LRU order.
|
||||
*/
|
||||
|
||||
#define GAMMA_NR_TEX_REGIONS 64
|
||||
GAMMATextureRegionRec texList[GAMMA_NR_TEX_REGIONS+1];
|
||||
/* Last elt is sentinal */
|
||||
int texAge; /* last time texture was uploaded */
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
||||
int last_quiescent; /* */
|
||||
int ctxOwner; /* last context to upload state */
|
||||
|
||||
int vertex_prim;
|
||||
} GLINTSAREADRIRec, *GLINTSAREADRIPtr;
|
||||
|
||||
/*
|
||||
* Glint specific record passed back to client driver
|
||||
* via DRIGetDeviceInfo request
|
||||
*/
|
||||
typedef struct {
|
||||
drmRegion registers0;
|
||||
drmRegion registers1;
|
||||
drmRegion registers2;
|
||||
drmRegion registers3;
|
||||
int numMultiDevices;
|
||||
int pprod;
|
||||
int cpp;
|
||||
int frontOffset;
|
||||
int frontPitch;
|
||||
int backOffset;
|
||||
int backPitch;
|
||||
int backX;
|
||||
int backY;
|
||||
int depthOffset;
|
||||
int depthPitch;
|
||||
int textureSize;
|
||||
int logTextureGranularity;
|
||||
} GLINTDRIRec, *GLINTDRIPtr;
|
||||
|
||||
#define GLINT_DRI_BUF_COUNT 256
|
||||
#define GLINT_DRI_BUF_SIZE 4096
|
||||
|
||||
#define GAMMA_NR_TEX_REGIONS 64
|
||||
|
||||
#define DMA_WRITE(val,reg) \
|
||||
do { \
|
||||
pGlint->buf2D++ = Glint##reg##Tag; \
|
||||
pGlint->buf2D++ = val; \
|
||||
} while (0)
|
||||
|
||||
#endif /* _GLINT_DRI_H_ */
|
||||
@ -1,296 +0,0 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.5 2000/06/17 10:00:13 alanh Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, 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, 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 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.
|
||||
|
||||
**************************************************************************/
|
||||
|
||||
/*
|
||||
* Author:
|
||||
* Jens Owen <jens@tungstengraphics.com>
|
||||
*
|
||||
*/
|
||||
|
||||
extern void GlxSetVisualConfigs(
|
||||
int nconfigs,
|
||||
__GLXvisualConfig *configs,
|
||||
void **configprivs
|
||||
);
|
||||
|
||||
extern Bool GLINTCreateContext(ScreenPtr pScreen,
|
||||
VisualPtr visual,
|
||||
drm_context_t hwContext,
|
||||
void* pVisualConfigPriv,
|
||||
DRIContextType contextStore);
|
||||
|
||||
extern void GLINTDRISwapContext( ScreenPtr pScreen,
|
||||
DRISyncType syncType,
|
||||
DRIContextType readContextType,
|
||||
void* readContextStore,
|
||||
DRIContextType writeContextType,
|
||||
void* writeContextStore);
|
||||
|
||||
/* Macros to Setup Generic Kernel Device Driver to Handle DMA for gamma */
|
||||
|
||||
/* WARNING!!! MAGIC NUMBER!!! The number of regions already added to the
|
||||
kernel must be specified here. Currently, the number is 2. */
|
||||
#define DRM_REG(reg) \
|
||||
(2 \
|
||||
+ ((reg < 0x1000) \
|
||||
? 0 \
|
||||
: ((reg < 0x10000) ? 1 : ((reg < 0x11000) ? 2 : 3))))
|
||||
|
||||
#define DRM_OFF(reg) \
|
||||
((reg < 0x1000) \
|
||||
? reg \
|
||||
: ((reg < 0x10000) \
|
||||
? (reg - 0x1000) \
|
||||
: ((reg < 0x11000) \
|
||||
? (reg - 0x10000) \
|
||||
: (reg - 0x11000))))
|
||||
|
||||
|
||||
#define DRM_I_WRITE_R(reg,a,b,c,d) \
|
||||
DRM_I_WRITE(DRM_REG(reg), DRM_OFF(reg), a, b, c, d)
|
||||
|
||||
#define DRM_I_WRITE_IMM_R(reg,a) \
|
||||
DRM_I_WRITE_IMM(DRM_REG(reg), DRM_OFF(reg), a)
|
||||
|
||||
#define DRM_I_READ_R(reg) \
|
||||
DRM_I_READ(DRM_REG(reg), DRM_OFF(reg))
|
||||
|
||||
#define DRM_I_WHILE_IMM_R(reg,a,b) \
|
||||
DRM_I_WHILE_IMM(DRM_REG(reg), DRM_OFF(reg), a, b)
|
||||
|
||||
#define DRM_I_IF_IMM_R(reg,a,b,c) \
|
||||
DRM_I_IF_IMM(DRM_REG(reg), DRM_OFF(reg), a, b, c)
|
||||
|
||||
#define GLINTSync GlintSync
|
||||
#define GLINTSyncTag 0x188
|
||||
|
||||
#define GLINT_MAX_DRAWABLES 15
|
||||
#define GLINT_GAMMA_CONTEXT_SIZE 964
|
||||
#define GLINT_GAMMA_CONTEXT_MASK 0x7ff
|
||||
|
||||
typedef struct {
|
||||
int index;
|
||||
} GLINTConfigPrivRec, *GLINTConfigPrivPtr;
|
||||
|
||||
typedef struct {
|
||||
|
||||
/* 2D components */
|
||||
CARD32 CStartXDom;
|
||||
CARD32 CdXDom;
|
||||
CARD32 CStartXSub;
|
||||
CARD32 CdXSub;
|
||||
CARD32 CStartY;
|
||||
CARD32 CdY;
|
||||
CARD32 CGLINTCount;
|
||||
CARD32 CPointTable0;
|
||||
CARD32 CPointTable1;
|
||||
CARD32 CPointTable2;
|
||||
CARD32 CPointTable3;
|
||||
CARD32 CRasterizerMode;
|
||||
CARD32 CYLimits;
|
||||
CARD32 CScanLineOwnership;
|
||||
CARD32 CPixelSize;
|
||||
CARD32 CScissorMode;
|
||||
CARD32 CScissorMinXY;
|
||||
CARD32 CScissorMaxXY;
|
||||
CARD32 CScreenSize;
|
||||
CARD32 CAreaStippleMode;
|
||||
CARD32 CLineStippleMode;
|
||||
CARD32 CLoadLineStippleCounters;
|
||||
CARD32 CWindowOrigin;
|
||||
CARD32 CRouterMode;
|
||||
CARD32 CTextureAddressMode;
|
||||
CARD32 CTextureReadMode;
|
||||
CARD32 CTextureColorMode;
|
||||
CARD32 CFogMode;
|
||||
CARD32 CColorDDAMode;
|
||||
CARD32 CGLINTColor;
|
||||
CARD32 CAlphaTestMode;
|
||||
CARD32 CAntialiasMode;
|
||||
CARD32 CAlphaBlendMode;
|
||||
CARD32 CDitherMode;
|
||||
CARD32 CFBSoftwareWriteMask;
|
||||
CARD32 CLogicalOpMode;
|
||||
CARD32 CFBWriteData;
|
||||
CARD32 CLBReadMode;
|
||||
CARD32 CLBSourceOffset;
|
||||
CARD32 CLBWindowBase;
|
||||
CARD32 CLBWriteMode;
|
||||
CARD32 CTextureDownloadOffset;
|
||||
CARD32 CLBWindowOffset;
|
||||
CARD32 CGLINTWindow;
|
||||
CARD32 CStencilMode;
|
||||
CARD32 CDepthMode;
|
||||
CARD32 CGLINTDepth;
|
||||
CARD32 CFBReadMode;
|
||||
CARD32 CFBSourceOffset;
|
||||
CARD32 CFBPixelOffset;
|
||||
CARD32 CFBWindowBase;
|
||||
CARD32 CFBWriteMode;
|
||||
CARD32 CFBHardwareWriteMask;
|
||||
CARD32 CFBBlockColor;
|
||||
CARD32 CPatternRamMode;
|
||||
CARD32 CFBBlockColorU;
|
||||
CARD32 CFBBlockColorL;
|
||||
CARD32 CFilterMode;
|
||||
CARD32 CStatisticMode;
|
||||
CARD32 CBroadcastMask;
|
||||
|
||||
/* 3D components */
|
||||
CARD32 CSStart;
|
||||
CARD32 CdSdx;
|
||||
CARD32 CdSdyDom;
|
||||
CARD32 CTStart;
|
||||
CARD32 CdTdx;
|
||||
CARD32 CdTdyDom;
|
||||
CARD32 CQStart;
|
||||
CARD32 CdQdx;
|
||||
CARD32 CdQdyDom;
|
||||
CARD32 CLOD;
|
||||
CARD32 CdSdy;
|
||||
CARD32 CdTdy;
|
||||
CARD32 CdQdy;
|
||||
CARD32 CTex;
|
||||
CARD32 CTextureFormat;
|
||||
CARD32 CTextureCacheControl;
|
||||
CARD32 CGLINTBorderColor;
|
||||
CARD32 CTexelLUTIndex;
|
||||
CARD32 CTexelLUTData;
|
||||
CARD32 CTexelLUTAddress;
|
||||
CARD32 CTexelLUTTransfer;
|
||||
CARD32 CTextureFilterMode;
|
||||
CARD32 CTextureChromaUpper;
|
||||
CARD32 CTextureChromaLower;
|
||||
CARD32 CTxBaseAddr0;
|
||||
CARD32 CTxBaseAddr1;
|
||||
CARD32 CTxBaseAddr2;
|
||||
CARD32 CTxBaseAddr3;
|
||||
CARD32 CTxBaseAddr4;
|
||||
CARD32 CTxBaseAddr5;
|
||||
CARD32 CTxBaseAddr6;
|
||||
CARD32 CTxBaseAddr7;
|
||||
CARD32 CTxBaseAddr8;
|
||||
CARD32 CTxBaseAddr9;
|
||||
CARD32 CTxBaseAddr10;
|
||||
CARD32 CTxBaseAddr11;
|
||||
CARD32 CTxBaseAddr12;
|
||||
CARD32 CTexelLUT0;
|
||||
CARD32 CTexelLUT1;
|
||||
CARD32 CTexelLUT2;
|
||||
CARD32 CTexelLUT3;
|
||||
CARD32 CTexelLUT4;
|
||||
CARD32 CTexelLUT5;
|
||||
CARD32 CTexelLUT6;
|
||||
CARD32 CTexelLUT7;
|
||||
CARD32 CTexelLUT8;
|
||||
CARD32 CTexelLUT9;
|
||||
CARD32 CTexelLUT10;
|
||||
CARD32 CTexelLUT11;
|
||||
CARD32 CTexelLUT12;
|
||||
CARD32 CTexelLUT13;
|
||||
CARD32 CTexelLUT14;
|
||||
CARD32 CTexelLUT15;
|
||||
CARD32 CTexel0;
|
||||
CARD32 CTexel1;
|
||||
CARD32 CTexel2;
|
||||
CARD32 CTexel3;
|
||||
CARD32 CTexel4;
|
||||
CARD32 CTexel5;
|
||||
CARD32 CTexel6;
|
||||
CARD32 CTexel7;
|
||||
CARD32 CInterp0;
|
||||
CARD32 CInterp1;
|
||||
CARD32 CInterp2;
|
||||
CARD32 CInterp3;
|
||||
CARD32 CInterp4;
|
||||
CARD32 CTextureFilter;
|
||||
CARD32 CTextureEnvColor;
|
||||
CARD32 CFogColor;
|
||||
CARD32 CFStart;
|
||||
CARD32 CdFdx;
|
||||
CARD32 CdFdyDom;
|
||||
CARD32 CKsStart;
|
||||
CARD32 CdKsdx;
|
||||
CARD32 CdKsdyDom;
|
||||
CARD32 CKdStart;
|
||||
CARD32 CdKdStart;
|
||||
CARD32 CdKddyDom;
|
||||
CARD32 CRStart;
|
||||
CARD32 CdRdx;
|
||||
CARD32 CdRdyDom;
|
||||
CARD32 CGStart;
|
||||
CARD32 CdGdx;
|
||||
CARD32 CdGdyDom;
|
||||
CARD32 CBStart;
|
||||
CARD32 CdBdx;
|
||||
CARD32 CdBdyDom;
|
||||
CARD32 CAStart;
|
||||
CARD32 CdAdx;
|
||||
CARD32 CdAdyDom;
|
||||
CARD32 CConstantColor;
|
||||
CARD32 CChromaUpper;
|
||||
CARD32 CChromaLower;
|
||||
CARD32 CChromaTestMode;
|
||||
CARD32 CStencilData;
|
||||
CARD32 CGLINTStencil;
|
||||
CARD32 CZStartU;
|
||||
CARD32 CZStartL;
|
||||
CARD32 CdZdxU;
|
||||
CARD32 CdZdxL;
|
||||
CARD32 CdZdyDomU;
|
||||
CARD32 CdZdyDomL;
|
||||
CARD32 CFastClearDepth;
|
||||
CARD32 CMinRegion;
|
||||
CARD32 CMaxRegion;
|
||||
CARD32 CKsRStart;
|
||||
CARD32 CdKsRdx;
|
||||
CARD32 CdKsRdyDom;
|
||||
CARD32 CKsGStart;
|
||||
CARD32 CdKsGdx;
|
||||
CARD32 CdKsGdyDom;
|
||||
CARD32 CKsBStart;
|
||||
CARD32 CdKsBdx;
|
||||
CARD32 CdKsBdyDom;
|
||||
CARD32 CKdRStart;
|
||||
CARD32 CdKdRdx;
|
||||
CARD32 CdKdRdyDom;
|
||||
CARD32 CKdGStart;
|
||||
CARD32 CdKdGdx;
|
||||
CARD32 CdKdGdyDom;
|
||||
CARD32 CKdBStart;
|
||||
CARD32 CdKdBdx;
|
||||
CARD32 CdKdBdyDom;
|
||||
|
||||
} GLINTMXRec;
|
||||
|
||||
typedef struct {
|
||||
GLINTMXRec MX1;
|
||||
GLINTMXRec MX2;
|
||||
CARD32 Gamma[GLINT_GAMMA_CONTEXT_SIZE];
|
||||
} GLINTDRIContextRec, *GLINTDRIContextPtr;
|
||||
@ -37,7 +37,6 @@
|
||||
#include "micmap.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86cmap.h"
|
||||
#include "shadowfb.h"
|
||||
@ -63,7 +62,7 @@
|
||||
|
||||
#ifdef XFreeXDGA
|
||||
#define _XF86DGA_SERVER_
|
||||
#include <X11/extensions/xf86dgastr.h>
|
||||
#include <X11/extensions/xf86dgaproto.h>
|
||||
#endif
|
||||
|
||||
#include "globals.h"
|
||||
@ -236,8 +235,6 @@ static RamDacSupportedInfoRec TIRamdacs[] = {
|
||||
{ -1 }
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
|
||||
static MODULESETUPPROTO(glintSetup);
|
||||
|
||||
static XF86ModuleVersionInfo glintVersRec =
|
||||
@ -271,8 +268,6 @@ glintSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* XFree86LOADER */
|
||||
|
||||
#define PARTPROD(a,b,c) (((a)<<6) | ((b)<<3) | (c))
|
||||
|
||||
static char bppand[4] = { 0x03, /* 8bpp */
|
||||
@ -363,13 +358,13 @@ GLINTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_300SX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_500TX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) {
|
||||
vtgpolarity = GLINT_READ_REG(VTGPolarity) & 0xFFFFFFF0;
|
||||
} else {
|
||||
videocontrol = GLINT_READ_REG(PMVideoControl) & 0xFFFFFFD6;
|
||||
@ -404,13 +399,13 @@ GLINTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_300SX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_500TX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) {
|
||||
GLINT_SLOW_WRITE_REG(vtgpolarity, VTGPolarity);
|
||||
} else {
|
||||
GLINT_SLOW_WRITE_REG(videocontrol, PMVideoControl);
|
||||
@ -442,7 +437,7 @@ GLINTFreeRec(ScrnInfoPtr pScrn)
|
||||
TRACE_ENTER("GLINTFreeRec");
|
||||
if (pScrn->driverPrivate == NULL)
|
||||
return;
|
||||
xfree(pScrn->driverPrivate);
|
||||
free(pScrn->driverPrivate);
|
||||
pScrn->driverPrivate = NULL;
|
||||
TRACE_EXIT("GLINTFreeRec");
|
||||
}
|
||||
@ -556,7 +551,7 @@ GLINTProbe(DriverPtr drv, int flags)
|
||||
}
|
||||
}
|
||||
|
||||
xfree(devSections);
|
||||
free(devSections);
|
||||
|
||||
} else if (checkusedPci)
|
||||
#endif
|
||||
@ -575,7 +570,7 @@ GLINTProbe(DriverPtr drv, int flags)
|
||||
numDevSections, drv, &usedChips);
|
||||
}
|
||||
|
||||
xfree(devSections);
|
||||
free(devSections);
|
||||
if (numUsed <= 0)
|
||||
return FALSE;
|
||||
foundScreen = TRUE;
|
||||
@ -618,9 +613,9 @@ GLINTProbe(DriverPtr drv, int flags)
|
||||
}
|
||||
} else
|
||||
/* Only claim other chips when GAMMA is used */
|
||||
if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) {
|
||||
if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA2) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_DELTA)) {
|
||||
while (*checkusedPci != NULL) {
|
||||
int eIndex;
|
||||
/* make sure we claim all but our source device */
|
||||
@ -642,7 +637,7 @@ GLINTProbe(DriverPtr drv, int flags)
|
||||
PCI_DEV_BUS(*checkusedPci),
|
||||
PCI_DEV_DEV(*checkusedPci),
|
||||
PCI_DEV_FUNC(*checkusedPci));
|
||||
xfree(usedChips);
|
||||
free(usedChips);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@ -695,7 +690,7 @@ GLINTProbe(DriverPtr drv, int flags)
|
||||
}
|
||||
}
|
||||
|
||||
xfree(usedChips);
|
||||
free(usedChips);
|
||||
|
||||
TRACE_EXIT("GLINTProbe");
|
||||
return foundScreen;
|
||||
@ -735,12 +730,12 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
|
||||
* only one chip is connected to GAMMA/DELTA as the entities > 1
|
||||
*/
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
linep = &partprod500TX[0];
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
linep = &partprodPermedia[0];
|
||||
break;
|
||||
@ -888,13 +883,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
for (i = 1; i < pScrn->numEntities; i++) {
|
||||
pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
|
||||
pPci = xf86GetPciInfoForEntity(pEnt->index);
|
||||
if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_MX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA) ||
|
||||
if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_MX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_PERMEDIA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_TI_PERMEDIA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_500TX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_300SX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_R4) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA3) ) {
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_500TX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_300SX) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_R4) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_PERMEDIA3) ) {
|
||||
pGlint->MultiChip = PCI_DEV_DEVICE_ID(pPci);
|
||||
if (pGlint->numMultiDevices >= GLINT_MAX_MULTI_DEVICES) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
|
||||
@ -913,9 +908,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
|
||||
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
|
||||
|
||||
if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) &&
|
||||
if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA2) ||
|
||||
(PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_DELTA)) &&
|
||||
(pGlint->numMultiDevices == 0) ) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Gamma/Delta with ZERO connected chips, aborting\n");
|
||||
@ -927,9 +922,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
|
||||
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
|
||||
|
||||
if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA) &&
|
||||
(PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA2) &&
|
||||
(PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_DELTA)) {
|
||||
if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_GAMMA) &&
|
||||
(PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_GAMMA2) &&
|
||||
(PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_DELTA)) {
|
||||
GLINTProbeDDC(pScrn, pGlint->pEnt->index);
|
||||
return TRUE;
|
||||
} else
|
||||
@ -1030,7 +1025,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
xf86CollectOptions(pScrn, NULL);
|
||||
|
||||
/* Process the options */
|
||||
if (!(pGlint->Options = xalloc(sizeof(GLINTOptions))))
|
||||
if (!(pGlint->Options = malloc(sizeof(GLINTOptions))))
|
||||
return FALSE;
|
||||
memcpy(pGlint->Options, GLINTOptions, sizeof(GLINTOptions));
|
||||
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pGlint->Options);
|
||||
@ -1319,7 +1314,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
break;
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
Permedia3PreInit(pScrn);
|
||||
break;
|
||||
}
|
||||
@ -1334,7 +1329,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
int base3copro, offset;
|
||||
|
||||
if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
|
||||
if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA) ||
|
||||
if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_TI_PERMEDIA)) {
|
||||
offset = 0x20; /* base4 */
|
||||
} else {
|
||||
@ -1424,38 +1419,38 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA:
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is GLINT Permedia\n");
|
||||
pScrn->videoRam = (((GLINT_READ_REG(PMMemConfig)>>29) &
|
||||
0x03) + 1) * 2048;
|
||||
break;
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is GLINT 300SX\n");
|
||||
pScrn->videoRam = (1 << ((GLINT_READ_REG(FBMemoryCtl) &
|
||||
0xE0000000)>>29)) * 1024;
|
||||
break;
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is GLINT 500TX\n");
|
||||
pScrn->videoRam = (1 << ((GLINT_READ_REG(FBMemoryCtl) &
|
||||
0xE0000000)>>29)) * 1024;
|
||||
break;
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is GLINT MX\n");
|
||||
pScrn->videoRam =
|
||||
(1 << ((GLINT_READ_REG(FBMemoryCtl) &
|
||||
0xE0000000)>>29)) * 1024;
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is Permedia3\n");
|
||||
pScrn->videoRam = Permedia3MemorySizeDetect(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
|
||||
"Attached Rasterizer is R4\n");
|
||||
pScrn->videoRam = Permedia3MemorySizeDetect(pScrn);
|
||||
@ -1646,7 +1641,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
pGlint->FIFOSize = 15;
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
maxheight = 1024;
|
||||
maxwidth = 1536;
|
||||
@ -1669,9 +1664,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if (!pGlint->RamDac)
|
||||
return FALSE;
|
||||
break;
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
if (pScrn->bitsPerPixel == 24) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, from,
|
||||
"-depth 24 -pixmap24 not supported by this chip.\n");
|
||||
@ -1766,8 +1761,8 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
}
|
||||
}
|
||||
if (!pGlint->RamDac) {
|
||||
if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA3) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_R4)) {
|
||||
if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) {
|
||||
pGlint->RefClock = 14318;
|
||||
pGlint->RamDacRec = RamDacCreateInfoRec();
|
||||
pGlint->RamDacRec->ReadDAC = Permedia2vInIndReg;
|
||||
@ -1836,18 +1831,18 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_300SX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_500TX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) )
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) )
|
||||
pGlint->MaxClock = 220000;
|
||||
if ( (pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
((pGlint->MultiChip == PCI_CHIP_PERMEDIA) ||
|
||||
((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_TI_PERMEDIA))) ) {
|
||||
switch (pScrn->bitsPerPixel) {
|
||||
case 8:
|
||||
@ -1886,9 +1881,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_R4)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) )
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) )
|
||||
pGlint->MaxClock = 300000;
|
||||
}
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "Max pixel clock is %d MHz\n",
|
||||
@ -1978,9 +1973,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_R4)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) {
|
||||
/*
|
||||
* XXX Assuming min pitch 256, max <maxwidth>
|
||||
* XXX Assuming min height 128, max <maxheight>
|
||||
@ -2067,13 +2062,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_300SX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_500TX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_MX)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
|
||||
"This GLINT chip only supports one modeline, using first\n");
|
||||
pScrn->modes->next = NULL;
|
||||
@ -2123,13 +2118,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
pGlint->pprod = partprod500TX[pScrn->displayWidth >> 5];
|
||||
pGlint->bppalign = 0;
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
pGlint->pprod = partprodPermedia[pScrn->displayWidth >> 5];
|
||||
pGlint->bppalign = bppand[(pScrn->bitsPerPixel>>3)-1];
|
||||
@ -2258,8 +2253,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/* Load XAA if needed */
|
||||
if (!pGlint->NoAccel) {
|
||||
if (!xf86LoadSubModule(pScrn, "xaa")) {
|
||||
GLINTFreeRec(pScrn);
|
||||
return FALSE;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
|
||||
pGlint->NoAccel = 1;
|
||||
pGlint->ShadowFB = 1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2448,9 +2444,9 @@ GLINTSave(ScrnInfoPtr pScrn)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2()
|
||||
TXSave(pScrn, glintReg2);
|
||||
@ -2462,13 +2458,13 @@ GLINTSave(ScrnInfoPtr pScrn)
|
||||
TXSave(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Save)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaSave(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Save)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
Permedia3Save(pScrn, glintReg2);
|
||||
@ -2527,9 +2523,9 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
ret = TXInit(pScrn, mode, glintReg2);
|
||||
@ -2537,12 +2533,12 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
}
|
||||
ret = TXInit(pScrn, mode, glintReg);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
ret = PermediaInit(pScrn, mode);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
ret = Permedia3Init(pScrn, mode, glintReg2);
|
||||
@ -2591,9 +2587,9 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
TXRestore(pScrn, glintReg2);
|
||||
@ -2605,13 +2601,13 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
TXRestore(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaRestore(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
Permedia3Restore(pScrn, glintReg2);
|
||||
@ -2623,8 +2619,10 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
break;
|
||||
}
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
|
||||
if (xf86IsPc98())
|
||||
outb(0xfac, 0x01);
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -2679,9 +2677,9 @@ GLINTRestore(ScrnInfoPtr pScrn)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
TXRestore(pScrn, glintReg2);
|
||||
@ -2693,13 +2691,13 @@ GLINTRestore(ScrnInfoPtr pScrn)
|
||||
TXRestore(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaRestore(pScrn, glintReg);
|
||||
(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
if (pGlint->numMultiDevices == 2) {
|
||||
ACCESSCHIP2();
|
||||
Permedia3Restore(pScrn, glintReg2);
|
||||
@ -2725,9 +2723,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
GLINTPtr pGlint = GLINTPTR(pScrn);
|
||||
int ret, displayWidth;
|
||||
#if HAVE_CFB8_32
|
||||
int init_picture = 0;
|
||||
#endif
|
||||
unsigned char *FBStart;
|
||||
VisualPtr visual;
|
||||
|
||||
@ -2799,19 +2794,6 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef XF86DRI_DEVEL
|
||||
/*
|
||||
* Setup DRI after visuals have been established, but before fbScreenInit
|
||||
* is called. fbScreenInit will eventually call into the drivers
|
||||
* InitGLXVisuals call back.
|
||||
*/
|
||||
if (!pGlint->NoAccel && pGlint->HWCursor) {
|
||||
pGlint->directRenderingEnabled = GLINTDRIScreenInit(pScreen);
|
||||
} else {
|
||||
pGlint->directRenderingEnabled = FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Call the framebuffer layer's ScreenInit function, and fill in other
|
||||
* pScreen fields.
|
||||
@ -2819,7 +2801,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
|
||||
if(pGlint->ShadowFB) {
|
||||
pGlint->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * pScrn->virtualX);
|
||||
pGlint->ShadowPtr = xalloc(pGlint->ShadowPitch * pScrn->virtualY);
|
||||
pGlint->ShadowPtr = malloc(pGlint->ShadowPitch * pScrn->virtualY);
|
||||
displayWidth = pGlint->ShadowPitch / (pScrn->bitsPerPixel >> 3);
|
||||
FBStart = pGlint->ShadowPtr;
|
||||
} else {
|
||||
@ -2832,30 +2814,11 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
case 8:
|
||||
case 16:
|
||||
case 24:
|
||||
#if !HAVE_CFB8_32
|
||||
case 32:
|
||||
#endif
|
||||
ret = fbScreenInit(pScreen, FBStart,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
displayWidth, pScrn->bitsPerPixel);
|
||||
#if HAVE_CFB8_32
|
||||
init_picture = 1;
|
||||
break;
|
||||
case 32:
|
||||
if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
|
||||
ret = cfb8_32ScreenInit(pScreen, FBStart,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
displayWidth);
|
||||
else {
|
||||
ret = fbScreenInit(pScreen, FBStart,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
displayWidth, pScrn->bitsPerPixel);
|
||||
init_picture = 1;
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
xf86DrvMsg(scrnIndex, X_ERROR,
|
||||
@ -2893,10 +2856,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
}
|
||||
|
||||
/* must be after RGB ordering fixed */
|
||||
#if HAVE_CFB8_32
|
||||
if (init_picture)
|
||||
#endif
|
||||
fbPictureInit(pScreen, 0, 0);
|
||||
fbPictureInit(pScreen, 0, 0);
|
||||
if (!pGlint->NoAccel) {
|
||||
switch (pGlint->Chipset)
|
||||
{
|
||||
@ -2922,19 +2882,19 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
TXAccelInit(pScreen);
|
||||
break;
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
SXAccelInit(pScreen);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaAccelInit(pScreen);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
Permedia3AccelInit(pScreen);
|
||||
break;
|
||||
}
|
||||
@ -2963,9 +2923,9 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_R4)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) )
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) )
|
||||
Permedia2vHWCursorInit(pScreen);
|
||||
else
|
||||
/* If we get here pGlint->Ramdac should have been set */
|
||||
@ -2987,9 +2947,9 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) ||
|
||||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_R4)) ||
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) {
|
||||
if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
|
||||
(pGlint->FBDev) ? fbdevHWLoadPaletteWeak() :
|
||||
((pScrn->depth == 16) ? Permedia3LoadPalette16:Permedia3LoadPalette),
|
||||
@ -3024,35 +2984,11 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
#if HAVE_CFB8_32
|
||||
if((pScrn->overlayFlags & OVERLAY_8_32_PLANAR) &&
|
||||
(pScrn->bitsPerPixel == 32)) {
|
||||
if(!xf86Overlay8Plus32Init(pScreen))
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
if(pGlint->ShadowFB)
|
||||
ShadowFBInit(pScreen, GLINTRefreshArea);
|
||||
|
||||
xf86DPMSInit(pScreen, (DPMSSetProcPtr)GLINTDisplayPowerManagementSet, 0);
|
||||
|
||||
#ifdef XF86DRI_DEVEL
|
||||
if (pGlint->directRenderingEnabled) {
|
||||
/* Now that mi, cfb, drm and others have done their thing,
|
||||
* complete the DRI setup.
|
||||
*/
|
||||
pGlint->directRenderingEnabled = GLINTDRIFinishScreenInit(pScreen);
|
||||
}
|
||||
if (pGlint->directRenderingEnabled) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"direct rendering enabled\n");
|
||||
} else {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"direct rendering disabled\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
pScrn->memPhysBase = pGlint->FbAddress;
|
||||
pScrn->fbOffset = 0;
|
||||
|
||||
@ -3079,8 +3015,8 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA:
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
Permedia3InitVideo(pScreen);
|
||||
}
|
||||
}
|
||||
@ -3136,19 +3072,19 @@ GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
TXInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
SXInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
Permedia3InitializeEngine(pScrn);
|
||||
break;
|
||||
}
|
||||
@ -3209,12 +3145,12 @@ GLINTAdjustFrame(int scrnIndex, int x, int y, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
base = (y * pScrn->displayWidth + x) >> pGlint->BppShift;
|
||||
GLINT_SLOW_WRITE_REG(base, PMScreenBase);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
GLINT_SLOW_WRITE_REG(base, PMScreenBase);
|
||||
break;
|
||||
@ -3283,19 +3219,19 @@ GLINTEnterVT(int scrnIndex, int flags)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
TXInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
SXInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
PermediaInitializeEngine(pScrn);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
Permedia3InitializeEngine(pScrn);
|
||||
break;
|
||||
}
|
||||
@ -3326,8 +3262,10 @@ GLINTLeaveVT(int scrnIndex, int flags)
|
||||
pGlint->STATE = TRUE;
|
||||
GLINTRestore(pScrn);
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
|
||||
if (xf86IsPc98())
|
||||
outb(0xfac, 0x00);
|
||||
#endif
|
||||
|
||||
TRACE_EXIT("GLINTLeaveVT");
|
||||
}
|
||||
@ -3346,11 +3284,6 @@ GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen)
|
||||
GLINTPtr pGlint = GLINTPTR(pScrn);
|
||||
|
||||
TRACE_ENTER("GLINTCloseScreen");
|
||||
#ifdef XF86DRI_DEVEL
|
||||
if (pGlint->directRenderingEnabled) {
|
||||
GLINTDRICloseScreen(pScreen);
|
||||
}
|
||||
#endif
|
||||
|
||||
switch (pGlint->Chipset) {
|
||||
case PCI_VENDOR_TI_CHIP_PERMEDIA2:
|
||||
@ -3375,16 +3308,15 @@ GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen)
|
||||
XAADestroyInfoRec(pGlint->AccelInfoRec);
|
||||
if(pGlint->CursorInfoRec)
|
||||
xf86DestroyCursorInfoRec(pGlint->CursorInfoRec);
|
||||
if (pGlint->ShadowPtr)
|
||||
xfree(pGlint->ShadowPtr);
|
||||
if (pGlint->DGAModes)
|
||||
xfree(pGlint->DGAModes);
|
||||
if (pGlint->ScratchBuffer)
|
||||
xfree(pGlint->ScratchBuffer);
|
||||
free(pGlint->ShadowPtr);
|
||||
free(pGlint->DGAModes);
|
||||
free(pGlint->ScratchBuffer);
|
||||
pScrn->vtSema = FALSE;
|
||||
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
|
||||
if (xf86IsPc98())
|
||||
outb(0xfac, 0x00);
|
||||
#endif
|
||||
|
||||
if(pGlint->BlockHandler)
|
||||
pScreen->BlockHandler = pGlint->BlockHandler;
|
||||
@ -3511,9 +3443,9 @@ GLINTSaveScreen(ScreenPtr pScreen, int mode)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
temp = GLINT_READ_REG(PMVideoControl);
|
||||
if (unblank) temp |= 1;
|
||||
@ -3727,21 +3659,21 @@ Shiftbpp(ScrnInfoPtr pScrn, int value)
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA2:
|
||||
case PCI_VENDOR_3DLABS_CHIP_DELTA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_500TX:
|
||||
case PCI_CHIP_300SX:
|
||||
case PCI_CHIP_MX:
|
||||
case PCI_CHIP_3DLABS_500TX:
|
||||
case PCI_CHIP_3DLABS_300SX:
|
||||
case PCI_CHIP_3DLABS_MX:
|
||||
if ( (pGlint->RamDac->RamDacType == (IBM640_RAMDAC)) ||
|
||||
(pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) )
|
||||
logbytesperaccess = 4;
|
||||
else
|
||||
logbytesperaccess = 3;
|
||||
break;
|
||||
case PCI_CHIP_PERMEDIA:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA:
|
||||
case PCI_CHIP_TI_PERMEDIA:
|
||||
logbytesperaccess = 2;
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
logbytesperaccess = 4;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
|
||||
|
||||
/*
|
||||
* glint register file
|
||||
*
|
||||
@ -32,6 +30,11 @@
|
||||
#define PCI_CHIP_3DLABS_PERMEDIA4 0x0C
|
||||
#define PCI_CHIP_3DLABS_R4 0x0D
|
||||
#define PCI_CHIP_3DLABS_GAMMA2 0x0E
|
||||
#define PCI_CHIP_3DLABS_R4ALT 0x11
|
||||
|
||||
/* Texas Instruments */
|
||||
#define PCI_CHIP_TI_PERMEDIA 0x3D04
|
||||
#define PCI_CHIP_TI_PERMEDIA2 0x3D07
|
||||
|
||||
/* The boards we know */
|
||||
#define IS_GLORIAXXL ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
|
||||
@ -1282,7 +1285,6 @@ do{ \
|
||||
} \
|
||||
}
|
||||
|
||||
#ifndef XF86DRI_DEVEL
|
||||
#define LOADROP(rop) \
|
||||
{ \
|
||||
if (pGlint->ROP != rop) { \
|
||||
@ -1290,14 +1292,7 @@ do{ \
|
||||
pGlint->ROP = rop; \
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define LOADROP(rop) \
|
||||
{ \
|
||||
GLINT_WRITE_REG(rop<<1|UNIT_ENABLE, LogicalOpMode); \
|
||||
pGlint->ROP = rop; \
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#define CHECKCLIPPING \
|
||||
{ \
|
||||
if (pGlint->ClippingOn) { \
|
||||
@ -1307,7 +1302,6 @@ do{ \
|
||||
} \
|
||||
}
|
||||
|
||||
#ifndef XF86DRI_DEVEL
|
||||
#define DO_PLANEMASK(planemask) \
|
||||
{ \
|
||||
if (planemask != pGlint->planemask) { \
|
||||
@ -1316,14 +1310,6 @@ do{ \
|
||||
GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define DO_PLANEMASK(planemask) \
|
||||
{ \
|
||||
pGlint->planemask = planemask; \
|
||||
REPLICATE(planemask); \
|
||||
GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Permedia Save/Restore functions */
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.0 1999/08/22 05:57:35 dawes Exp $ */
|
||||
|
||||
/*
|
||||
Copyright (c) 1999, The XFree86 Project Inc.
|
||||
Code adapted from mga/mga_shadow.c (Mark Vojkovich <markv@valinux.com>)
|
||||
@ -12,7 +10,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "glint.h"
|
||||
#include "shadowfb.h"
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
*
|
||||
* Permedia 2 accelerated options.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.30 2001/05/30 11:41:53 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -40,7 +39,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "miline.h"
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
|
||||
* Siemens Nixdorf Informationssysteme
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.26tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -38,7 +37,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "glint_regs.h"
|
||||
@ -122,9 +120,9 @@ Permedia2Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
pReg->glintRegs[PMScreenStride >> 3] =
|
||||
Shiftbpp(pScrn,pScrn->displayWidth>>1);
|
||||
|
||||
pReg->glintRegs[PMVTotal >> 3] = mode->CrtcVTotal;
|
||||
pReg->glintRegs[PMVsEnd >> 3] = temp2 + temp4;
|
||||
pReg->glintRegs[PMVsStart >> 3] = temp2;
|
||||
pReg->glintRegs[PMVTotal >> 3] = mode->CrtcVTotal - 1;
|
||||
pReg->glintRegs[PMVsEnd >> 3] = temp2 + temp4 - 1;
|
||||
pReg->glintRegs[PMVsStart >> 3] = temp2 - 1;
|
||||
pReg->glintRegs[PMVbEnd >> 3] = mode->CrtcVTotal - mode->CrtcVDisplay;
|
||||
|
||||
/* The hw cursor needs /VSYNC to recognize vert retrace. We'll stick
|
||||
@ -146,8 +144,6 @@ Permedia2Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
|
||||
pReg->glintRegs[VClkCtl >> 3] = (GLINT_READ_REG(VClkCtl) & 0xFFFFFFFC);
|
||||
pReg->glintRegs[PMScreenBase >> 3] = 0;
|
||||
pReg->glintRegs[PMHTotal >> 3] -= 1;
|
||||
pReg->glintRegs[PMHsStart >> 3] -= 1;
|
||||
pReg->glintRegs[PMVTotal >> 3] -= 1;
|
||||
|
||||
pReg->glintRegs[ChipConfig >> 3] = GLINT_READ_REG(ChipConfig) & 0xFFFFFFDD;
|
||||
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
* 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
|
||||
*/
|
||||
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.25tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -30,7 +28,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86fbman.h"
|
||||
#include "xf86i2c.h"
|
||||
#include "xf86xv.h"
|
||||
@ -183,10 +180,8 @@ static AdaptorPrivPtr AdaptorPrivList = NULL;
|
||||
|
||||
#define FreeCookies(pPPriv) \
|
||||
do { \
|
||||
if ((pPPriv)->pCookies) { \
|
||||
xfree((pPPriv)->pCookies); \
|
||||
free((pPPriv)->pCookies); \
|
||||
(pPPriv)->pCookies = NULL; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define PORTNUM(p) ((int)((p) - &pAPriv->Port[0]))
|
||||
@ -203,28 +198,22 @@ static const Bool ColorBars = FALSE;
|
||||
|
||||
typedef enum {
|
||||
OPTION_DEVICE,
|
||||
OPTION_FPS,
|
||||
OPTION_BUFFERS,
|
||||
OPTION_ENCODING,
|
||||
OPTION_EXPOSE /* obsolete, ignored */
|
||||
OPTION_IN_FPS,
|
||||
OPTION_IN_BUFFERS,
|
||||
OPTION_IN_ENCODING,
|
||||
OPTION_OUT_FPS,
|
||||
OPTION_OUT_BUFFERS,
|
||||
OPTION_OUT_ENCODING,
|
||||
} OptToken;
|
||||
|
||||
/* XXX These should be made const, and per-screen/adaptor copies processed. */
|
||||
static OptionInfoRec AdaptorOptions[] = {
|
||||
static const OptionInfoRec pm2Options[] = {
|
||||
{ OPTION_DEVICE, "Device", OPTV_STRING, {0}, FALSE },
|
||||
{ -1, NULL, OPTV_NONE, {0}, FALSE }
|
||||
};
|
||||
static OptionInfoRec InputOptions[] = {
|
||||
{ OPTION_BUFFERS, "Buffers", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_FPS, "FramesPerSec", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_ENCODING, "Encoding", OPTV_STRING, {0}, FALSE },
|
||||
{ -1, NULL, OPTV_NONE, {0}, FALSE }
|
||||
};
|
||||
static OptionInfoRec OutputOptions[] = {
|
||||
{ OPTION_BUFFERS, "Buffers", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_EXPOSE, "Expose", OPTV_BOOLEAN, {0}, FALSE },
|
||||
{ OPTION_FPS, "FramesPerSec", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_ENCODING, "Encoding", OPTV_STRING, {0}, FALSE },
|
||||
{ OPTION_IN_BUFFERS, "InputBuffers", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_IN_FPS, "InputFramesPerSec", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_IN_ENCODING, "InputEncoding", OPTV_STRING, {0}, FALSE },
|
||||
{ OPTION_OUT_BUFFERS, "OutputBuffers", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_OUT_FPS, "OutputFramesPerSec", OPTV_INTEGER, {0}, FALSE },
|
||||
{ OPTION_OUT_ENCODING, "OutputEncoding", OPTV_STRING, {0}, FALSE },
|
||||
{ -1, NULL, OPTV_NONE, {0}, FALSE }
|
||||
};
|
||||
|
||||
@ -795,7 +784,7 @@ RemakePutCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
|
||||
nBox = REGION_NUM_RECTS(pRegion);
|
||||
|
||||
if (!pPPriv->pCookies || pPPriv->nCookies < nBox) {
|
||||
if (!(pCookie = (CookiePtr) xrealloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
|
||||
if (!(pCookie = (CookiePtr) realloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
|
||||
return FALSE;
|
||||
|
||||
pPPriv->pCookies = pCookie;
|
||||
@ -1071,7 +1060,7 @@ RemakeGetCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
|
||||
nBox = REGION_NUM_RECTS(pRegion);
|
||||
|
||||
if (!pPPriv->pCookies || pPPriv->nCookies < nBox) {
|
||||
if (!(pCookie = (CookiePtr) xrealloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
|
||||
if (!(pCookie = (CookiePtr) realloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
|
||||
return FALSE;
|
||||
|
||||
pPPriv->pCookies = pCookie;
|
||||
@ -1722,6 +1711,56 @@ CopyYV12(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
|
||||
}
|
||||
}
|
||||
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
|
||||
static void
|
||||
CopyYV12_16(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
|
||||
{
|
||||
int Y_size = width * height;
|
||||
CARD8 *V = Y + Y_size;
|
||||
CARD8 *U = V + (Y_size >> 2);
|
||||
int pad = (pitch >> 2) - (width >> 1);
|
||||
int x;
|
||||
|
||||
width >>= 1;
|
||||
|
||||
for (height >>= 1; height > 0; height--) {
|
||||
for (x = 0; x < width; Y += 2, x++)
|
||||
*dst++ = Y[1] + (V[x] << 8) + (Y[0] << 16) + (U[x] << 24);
|
||||
dst += pad;
|
||||
for (x = 0; x < width; Y += 2, x++)
|
||||
*dst++ = Y[1] + (V[x] << 8) + (Y[0] << 16) + (U[x] << 24);
|
||||
dst += pad;
|
||||
U += width;
|
||||
V += width;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
CopyYV12_8(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
|
||||
{
|
||||
int Y_size = width * height;
|
||||
CARD8 *V = Y + Y_size;
|
||||
CARD8 *U = V + (Y_size >> 2);
|
||||
int pad = (pitch >> 2) - (width >> 1);
|
||||
int x;
|
||||
|
||||
width >>= 1;
|
||||
|
||||
for (height >>= 1; height > 0; height--) {
|
||||
for (x = 0; x < width; Y += 2, x++)
|
||||
*dst++ = V[x] + (Y[1] << 8) + (U[x] << 16) + (Y[0] << 24);
|
||||
dst += pad;
|
||||
for (x = 0; x < width; Y += 2, x++)
|
||||
*dst++ = V[x] + (Y[1] << 8) + (U[x] << 16) + (Y[0] << 24);
|
||||
dst += pad;
|
||||
U += width;
|
||||
V += width;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void
|
||||
CopyFlat(CARD8 *src, CARD8 *dst, int width, int height, int pitch)
|
||||
{
|
||||
@ -1818,8 +1857,24 @@ Permedia2PutImage(ScrnInfoPtr pScrn,
|
||||
|
||||
switch (id) {
|
||||
case LE4CC('Y','V','1','2'):
|
||||
CopyYV12(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
|
||||
width, height, pPPriv->BufferStride);
|
||||
switch(pGlint->HwBpp) {
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
case 8:
|
||||
case 24:
|
||||
CopyYV12_8(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
|
||||
width, height, pPPriv->BufferStride);
|
||||
break;
|
||||
case 15:
|
||||
case 16:
|
||||
CopyYV12_16(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
|
||||
width, height, pPPriv->BufferStride);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
CopyYV12(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
|
||||
width, height, pPPriv->BufferStride);
|
||||
break;
|
||||
}
|
||||
PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_YUYV, 1, 0);
|
||||
break;
|
||||
|
||||
@ -2393,7 +2448,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
|
||||
|
||||
xvipc.a = -1;
|
||||
|
||||
pLFBArea = xalloc(sizeof(LFBAreaRec));
|
||||
pLFBArea = malloc(sizeof(LFBAreaRec));
|
||||
|
||||
if (pLFBArea) {
|
||||
pLFBArea->pFBArea = pFBArea =
|
||||
@ -2406,7 +2461,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
|
||||
((pFBArea->box.y1 * pScrn->displayWidth) +
|
||||
pFBArea->box.x1) << BPPSHIFT(pGlint);
|
||||
} else
|
||||
xfree(pLFBArea);
|
||||
free(pLFBArea);
|
||||
}
|
||||
|
||||
/* Report results */
|
||||
@ -2414,7 +2469,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
|
||||
if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) != 0)
|
||||
if (pFBArea) {
|
||||
xf86FreeOffscreenArea(pFBArea);
|
||||
xfree(pLFBArea);
|
||||
free(pLFBArea);
|
||||
pFBArea = NULL;
|
||||
}
|
||||
|
||||
@ -2448,7 +2503,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
|
||||
if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) == 0 && pLFBArea) {
|
||||
xf86FreeOffscreenArea(pLFBArea->pFBArea);
|
||||
*ppLFBArea = pLFBArea->Next;
|
||||
xfree(pLFBArea);
|
||||
free(pLFBArea);
|
||||
}
|
||||
|
||||
goto event;
|
||||
@ -2622,14 +2677,14 @@ DeleteAdaptorPriv(AdaptorPrivPtr pAPriv)
|
||||
}
|
||||
}
|
||||
|
||||
xfree(pAPriv);
|
||||
free(pAPriv);
|
||||
}
|
||||
|
||||
static AdaptorPrivPtr
|
||||
NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO)
|
||||
{
|
||||
GLINTPtr pGlint = GLINTPTR(pScrn);
|
||||
AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) xcalloc(1, sizeof(AdaptorPrivRec));
|
||||
AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) calloc(1, sizeof(AdaptorPrivRec));
|
||||
int i;
|
||||
|
||||
if (!pAPriv)
|
||||
@ -2718,7 +2773,7 @@ NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO)
|
||||
break;
|
||||
|
||||
default:
|
||||
xfree(pAPriv);
|
||||
free(pAPriv);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -2932,12 +2987,13 @@ Permedia2VideoInit(ScreenPtr pScreen)
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
GLINTPtr pGlint = GLINTPTR(pScrn);
|
||||
AdaptorPrivPtr pAPriv;
|
||||
pointer options[3];
|
||||
DevUnion Private[PORTS];
|
||||
XF86VideoAdaptorRec VAR[ADAPTORS];
|
||||
XF86VideoAdaptorPtr VARPtrs[ADAPTORS];
|
||||
Bool VideoIO = TRUE;
|
||||
int i;
|
||||
/* Glint is still intializing, so pGlint->Options is off-limits. */
|
||||
OptionInfoPtr VidOpts;
|
||||
|
||||
switch (pGlint->Chipset) {
|
||||
case PCI_VENDOR_TI_CHIP_PERMEDIA2:
|
||||
@ -2949,64 +3005,50 @@ Permedia2VideoInit(ScreenPtr pScreen)
|
||||
return;
|
||||
}
|
||||
|
||||
options[0] = NULL; /* VideoAdaptor "input" subsection options */
|
||||
options[1] = NULL; /* VideoAdaptor "output" subsection options */
|
||||
options[2] = NULL; /* VideoAdaptor options */
|
||||
|
||||
for (i = 0;; i++) {
|
||||
char *adaptor = NULL; /* receives VideoAdaptor section identifier */
|
||||
|
||||
if (!options[0])
|
||||
options[0] = xf86FindXvOptions(pScreen->myNum, i, "input", &adaptor, options[2] ? NULL : &options[2]);
|
||||
|
||||
if (!options[1])
|
||||
options[1] = xf86FindXvOptions(pScreen->myNum, i, "output", &adaptor, options[2] ? NULL : &options[2]);
|
||||
|
||||
if (!adaptor) {
|
||||
if (!i) /* VideoAdaptor reference enables Xv vio driver */
|
||||
VideoIO = FALSE;
|
||||
break;
|
||||
} else if (options[0] && options[1])
|
||||
break;
|
||||
}
|
||||
|
||||
if (VideoIO) {
|
||||
unsigned int temp;
|
||||
PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
|
||||
switch (temp) {
|
||||
case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
|
||||
case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
|
||||
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
|
||||
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C:
|
||||
break;
|
||||
|
||||
default:
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
|
||||
VideoIO = FALSE;
|
||||
}
|
||||
}
|
||||
if (pGlint->NoAccel && !VideoIO)
|
||||
xf86CollectOptions(pScrn, NULL);
|
||||
/* Process the options */
|
||||
if (!(VidOpts = malloc(sizeof(pm2Options))))
|
||||
return;
|
||||
|
||||
memcpy(VidOpts, pm2Options, sizeof(pm2Options));
|
||||
|
||||
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, VidOpts);
|
||||
xf86ShowUnusedOptions(pScrn->scrnIndex, VidOpts);
|
||||
|
||||
/* Don't complain about no Xv support unless they asked for Xv support.
|
||||
Assume they want Xv if OPTION_DEVICE is set, since that's required. */
|
||||
if (xf86IsOptionSet(VidOpts, OPTION_DEVICE)) {
|
||||
unsigned int temp;
|
||||
PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
|
||||
switch (temp) {
|
||||
case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
|
||||
case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
|
||||
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
|
||||
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C:
|
||||
break;
|
||||
default:
|
||||
VideoIO = FALSE;
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
|
||||
}
|
||||
}
|
||||
else
|
||||
/* Assume they don't, even if other options are set. */
|
||||
VideoIO = FALSE;
|
||||
|
||||
if (pGlint->NoAccel && !VideoIO) {
|
||||
free(VidOpts);
|
||||
return;
|
||||
}
|
||||
|
||||
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Initializing Xv driver rev. 4\n");
|
||||
|
||||
if (VideoIO) {
|
||||
for (i = 0; i <= 2; i++) {
|
||||
xf86ProcessOptions(pScrn->scrnIndex, options[i],
|
||||
(i == 0) ? InputOptions :
|
||||
(i == 1) ? OutputOptions :
|
||||
AdaptorOptions);
|
||||
|
||||
xf86ShowUnusedOptions(pScrn->scrnIndex, options[i]);
|
||||
}
|
||||
|
||||
if (xf86IsOptionSet(AdaptorOptions, OPTION_DEVICE)) {
|
||||
if (!xvipcOpen(xf86GetOptValString(AdaptorOptions, OPTION_DEVICE), pScrn))
|
||||
if (VideoIO) {
|
||||
if (!xvipcOpen(xf86GetOptValString(VidOpts, OPTION_DEVICE), pScrn))
|
||||
VideoIO = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(pAPriv = NewAdaptorPriv(pScrn, VideoIO))) {
|
||||
free(VidOpts);
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv driver initialization failed\n");
|
||||
return;
|
||||
}
|
||||
@ -3014,14 +3056,14 @@ Permedia2VideoInit(ScreenPtr pScreen)
|
||||
if (VideoIO) {
|
||||
int n;
|
||||
|
||||
if (xf86GetOptValInteger(InputOptions, OPTION_BUFFERS, &n))
|
||||
if (xf86GetOptValInteger(VidOpts, OPTION_IN_BUFFERS, &n))
|
||||
pAPriv->Port[0].BuffersRequested = CLAMP(n, 1, 2);
|
||||
if (xf86GetOptValInteger(InputOptions, OPTION_FPS, &n))
|
||||
if (xf86GetOptValInteger(VidOpts, OPTION_IN_FPS, &n))
|
||||
pAPriv->Port[0].FramesPerSec = CLAMP(n, 1, 30);
|
||||
|
||||
if (xf86GetOptValInteger(OutputOptions, OPTION_BUFFERS, &n))
|
||||
if (xf86GetOptValInteger(VidOpts, OPTION_OUT_BUFFERS, &n))
|
||||
pAPriv->Port[1].BuffersRequested = 1;
|
||||
if (xf86GetOptValInteger(OutputOptions, OPTION_FPS, &n))
|
||||
if (xf86GetOptValInteger(VidOpts, OPTION_OUT_FPS, &n))
|
||||
pAPriv->Port[1].FramesPerSec = CLAMP(n, 1, 30);
|
||||
}
|
||||
|
||||
@ -3146,14 +3188,14 @@ Permedia2VideoInit(ScreenPtr pScreen)
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv frontend scaler enabled\n");
|
||||
|
||||
if (VideoIO) {
|
||||
if ((s = xf86GetOptValString(InputOptions, OPTION_ENCODING)))
|
||||
if ((s = xf86GetOptValString(VidOpts, OPTION_IN_ENCODING)))
|
||||
for (i = 0; i < ENTRIES(InputVideoEncodings); i++)
|
||||
if (!strncmp(s, InputVideoEncodings[i].name, strlen(s))) {
|
||||
Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[0]);
|
||||
break;
|
||||
}
|
||||
|
||||
if ((s = xf86GetOptValString(OutputOptions, OPTION_ENCODING)))
|
||||
if ((s = xf86GetOptValString(VidOpts, OPTION_OUT_ENCODING)))
|
||||
for (i = 0; i < ENTRIES(OutputVideoEncodings); i++)
|
||||
if (!strncmp(s, OutputVideoEncodings[i].name, strlen(s))) {
|
||||
Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[1]);
|
||||
@ -3167,4 +3209,6 @@ Permedia2VideoInit(ScreenPtr pScreen)
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv initialization failed\n");
|
||||
DeleteAdaptorPriv(pAPriv);
|
||||
}
|
||||
|
||||
free(VidOpts);
|
||||
}
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
* Permedia2OutIndReg() and Permedia2InIndReg() are used to access
|
||||
* the indirect Permedia2 RAMDAC registers only.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.10 1999/07/18 03:26:57 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -33,7 +32,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "glint_regs.h"
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
|
||||
* Siemens Nixdorf Informationssysteme
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.29tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -36,7 +35,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "glint_regs.h"
|
||||
@ -497,7 +495,7 @@ Permedia2vCursorColorCallback(
|
||||
|
||||
if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) {
|
||||
/* PM3 uses last 2 indexes into hardware cursor palette fg first...*/
|
||||
Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+39, 0x00, (fg>>16)&0xff);
|
||||
Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+40, 0x00, (fg>>8)&0xff);
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
* Permedia2vOutIndReg() and Permedia2vInIndReg() are used to access
|
||||
* the indirect Permedia2v RAMDAC registers only.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.5 2001/01/30 10:06:35 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -33,7 +32,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "glint_regs.h"
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.5 2005/07/11 02:29:49 ajax Exp $ */
|
||||
/*
|
||||
* Copyright 2000-2001 by Sven Luther <luther@dpt-info.u-strasbg.fr>.
|
||||
*
|
||||
@ -27,7 +26,6 @@
|
||||
*
|
||||
* Permedia 3 accelerated options.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.30 2002/05/21 14:38:04 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -37,7 +35,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "miline.h"
|
||||
@ -67,7 +64,6 @@
|
||||
#define PM3_OTHERWRITEMASK \
|
||||
(pGlint->PM3_UsingSGRAM ? PM3FBSoftwareWriteMask : PM3FBHardwareWriteMask )
|
||||
|
||||
#ifndef XF86DRI_DEVEL
|
||||
#define PM3_PLANEMASK(planemask) \
|
||||
{ \
|
||||
if (planemask != pGlint->planemask) { \
|
||||
@ -76,14 +72,6 @@
|
||||
GLINT_WRITE_REG(planemask, PM3_WRITEMASK); \
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define PM3_PLANEMASK(planemask) \
|
||||
{ \
|
||||
pGlint->planemask = planemask; \
|
||||
REPLICATE(planemask); \
|
||||
GLINT_WRITE_REG(planemask, PM3_WRITEMASK); \
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Clipping */
|
||||
static void Permedia3SetClippingRectangle(ScrnInfoPtr pScrn, int x, int y,
|
||||
@ -450,9 +438,7 @@ Permedia3AccelInit(ScreenPtr pScreen)
|
||||
CPU_TRANSFER_PAD_DWORD;
|
||||
|
||||
infoPtr->NumScanlineColorExpandBuffers = 1;
|
||||
pGlint->ScratchBuffer = xalloc(((pScrn->virtualX+62)/32*4)
|
||||
+ (pScrn->virtualX
|
||||
* pScrn->bitsPerPixel / 8));
|
||||
pGlint->ScratchBuffer = malloc(((pScrn->virtualX + 62) / 32 * 4) + (pScrn->virtualX * pScrn->bitsPerPixel / 8));
|
||||
infoPtr->ScanlineColorExpandBuffers =
|
||||
pGlint->XAAScanlineColorExpandBuffers;
|
||||
pGlint->XAAScanlineColorExpandBuffers[0] =
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
* this work is sponsored by Appian Graphics.
|
||||
*
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.33tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -35,7 +34,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86int10.h"
|
||||
|
||||
@ -115,8 +113,9 @@ Permedia3MemorySizeDetect(ScrnInfoPtr pScrn)
|
||||
for(i=0;i<32;i++) {
|
||||
/* Clear first 32MB */
|
||||
MMIO_OUT32(pGlint->FbBase, i*1024*1024, 0);
|
||||
mem_barrier();
|
||||
}
|
||||
mem_barrier();
|
||||
|
||||
for(i=32;i<64;i++) {
|
||||
/* write test pattern */
|
||||
MMIO_OUT32(pGlint->FbBase, i*1024*1024, i*0x00345678);
|
||||
@ -501,7 +500,7 @@ Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
|
||||
temp3 = mode->CrtcHSyncEnd - mode->CrtcHSyncStart;
|
||||
temp4 = mode->CrtcVSyncEnd - mode->CrtcVSyncStart;
|
||||
|
||||
STOREREG(PMHTotal, Shiftbpp(pScrn, mode->CrtcHTotal - 1));
|
||||
STOREREG(PMHTotal, Shiftbpp(pScrn, mode->CrtcHTotal) - 1);
|
||||
STOREREG(PMHsEnd, Shiftbpp(pScrn, temp1 + temp3));
|
||||
STOREREG(PMHsStart, Shiftbpp(pScrn, temp1));
|
||||
STOREREG(PMHbEnd, Shiftbpp(pScrn, mode->CrtcHTotal - mode->CrtcHDisplay));
|
||||
@ -565,11 +564,11 @@ Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
|
||||
break;
|
||||
case PCI_VENDOR_3DLABS_CHIP_GAMMA:
|
||||
switch (pGlint->MultiChip) {
|
||||
case PCI_CHIP_PERMEDIA3:
|
||||
case PCI_CHIP_3DLABS_PERMEDIA3:
|
||||
(void) PM3DAC_CalculateClock(mode->Clock,
|
||||
pGlint->RefClock, &m,&n,&p);
|
||||
break;
|
||||
case PCI_CHIP_R4:
|
||||
case PCI_CHIP_3DLABS_R4:
|
||||
(void) PM4DAC_CalculateClock(mode->Clock,
|
||||
pGlint->RefClock, &m,&n,&p);
|
||||
break;
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
|
||||
|
||||
/*
|
||||
* glint register file
|
||||
*
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
* Authors: Alan Hourihane, alanh@fairlite.demon.co.uk
|
||||
* Sven Luther <luther@dpt-info.u-strasbg.fr>
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.14tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -31,7 +30,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "compiler.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "xf86fbman.h"
|
||||
#include "regionstr.h"
|
||||
@ -98,7 +96,7 @@ void Permedia3InitVideo(ScreenPtr pScreen)
|
||||
adaptors = &newAdaptor;
|
||||
} else {
|
||||
newAdaptors = /* need to free this someplace */
|
||||
xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
|
||||
malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
|
||||
if(newAdaptors) {
|
||||
memcpy(newAdaptors, adaptors, num_adaptors *
|
||||
sizeof(XF86VideoAdaptorPtr));
|
||||
@ -112,8 +110,7 @@ void Permedia3InitVideo(ScreenPtr pScreen)
|
||||
if(num_adaptors)
|
||||
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
|
||||
|
||||
if(newAdaptors)
|
||||
xfree(newAdaptors);
|
||||
free(newAdaptors);
|
||||
}
|
||||
|
||||
/* client libraries expect an encoding */
|
||||
@ -288,7 +285,7 @@ Permedia3SetupImageVideo(ScreenPtr pScreen)
|
||||
XF86VideoAdaptorPtr adapt;
|
||||
GLINTPortPrivPtr pPriv;
|
||||
|
||||
if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
|
||||
if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
|
||||
sizeof(GLINTPortPrivRec) +
|
||||
sizeof(DevUnion))))
|
||||
return NULL;
|
||||
@ -1030,12 +1027,12 @@ Permedia3AllocateSurface(
|
||||
surface->width = w;
|
||||
surface->height = h;
|
||||
|
||||
if(!(surface->offsets = xalloc(sizeof(int)))) {
|
||||
if(!(surface->offsets = malloc(sizeof(int)))) {
|
||||
xf86FreeOffscreenArea(area);
|
||||
return BadAlloc;
|
||||
}
|
||||
if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
|
||||
xfree(surface->offsets);
|
||||
if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
|
||||
free(surface->offsets);
|
||||
xf86FreeOffscreenArea(area);
|
||||
return BadAlloc;
|
||||
}
|
||||
@ -1080,9 +1077,9 @@ Permedia3FreeSurface(
|
||||
if(pPriv->isOn)
|
||||
Permedia3StopSurface(surface);
|
||||
xf86FreeOffscreenArea(pPriv->area);
|
||||
xfree(surface->pitches);
|
||||
xfree(surface->offsets);
|
||||
xfree(surface->devPrivate.ptr);
|
||||
free(surface->pitches);
|
||||
free(surface->offsets);
|
||||
free(surface->devPrivate.ptr);
|
||||
|
||||
return Success;
|
||||
}
|
||||
@ -1235,7 +1232,7 @@ Permedia3InitOffscreenImages(ScreenPtr pScreen)
|
||||
XF86OffscreenImagePtr offscreenImages;
|
||||
|
||||
/* need to free this someplace */
|
||||
if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
|
||||
if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
|
||||
return;
|
||||
|
||||
offscreenImages[0].image = &Images[0];
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
*
|
||||
* Permedia accelerated options.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.24tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -37,7 +36,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "fb.h"
|
||||
@ -241,9 +239,7 @@ PermediaAccelInit(ScreenPtr pScreen)
|
||||
BIT_ORDER_IN_BYTE_LSBFIRST;
|
||||
|
||||
infoPtr->NumScanlineColorExpandBuffers = 1;
|
||||
pGlint->ScratchBuffer = xalloc(((pScrn->virtualX+62)/32*4)
|
||||
+ (pScrn->virtualX
|
||||
* pScrn->bitsPerPixel / 8));
|
||||
pGlint->ScratchBuffer = malloc(((pScrn->virtualX + 62) / 32 * 4) + (pScrn->virtualX * pScrn->bitsPerPixel / 8));
|
||||
infoPtr->ScanlineColorExpandBuffers =
|
||||
pGlint->XAAScanlineColorExpandBuffers;
|
||||
pGlint->XAAScanlineColorExpandBuffers[0] =
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
|
||||
* Siemens Nixdorf Informationssysteme
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.11tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -36,7 +35,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "IBM.h"
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
*
|
||||
* GLINT 300SX accelerated options.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.7 2001/05/29 11:23:38 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -37,7 +36,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "fb.h"
|
||||
@ -221,7 +219,7 @@ SXAccelInit(ScreenPtr pScreen)
|
||||
BIT_ORDER_IN_BYTE_LSBFIRST;
|
||||
|
||||
infoPtr->NumScanlineColorExpandBuffers = 1;
|
||||
pGlint->ScratchBuffer = xalloc(((pScrn->virtualX+62)/32*4)
|
||||
pGlint->ScratchBuffer = malloc(((pScrn->virtualX+62)/32*4)
|
||||
+ (pScrn->virtualX
|
||||
* pScrn->bitsPerPixel / 8));
|
||||
infoPtr->ScanlineColorExpandBuffers =
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
*
|
||||
* GLINT 500TX / MX accelerated options.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.27 2001/05/29 11:23:38 alanh Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -37,7 +36,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "fb.h"
|
||||
@ -254,9 +252,7 @@ TXAccelInit(ScreenPtr pScreen)
|
||||
BIT_ORDER_IN_BYTE_LSBFIRST;
|
||||
|
||||
infoPtr->NumScanlineColorExpandBuffers = 1;
|
||||
pGlint->ScratchBuffer = xalloc(((pScrn->virtualX+62)/32*4)
|
||||
+ (pScrn->virtualX
|
||||
* pScrn->bitsPerPixel / 8));
|
||||
pGlint->ScratchBuffer = malloc(((pScrn->virtualX + 62) / 32 * 4) + (pScrn->virtualX * pScrn->bitsPerPixel / 8));
|
||||
infoPtr->ScanlineColorExpandBuffers =
|
||||
pGlint->XAAScanlineColorExpandBuffers;
|
||||
pGlint->XAAScanlineColorExpandBuffers[0] =
|
||||
@ -296,7 +292,6 @@ static void TXLoadCoord(
|
||||
){
|
||||
GLINTPtr pGlint = GLINTPTR(pScrn);
|
||||
|
||||
#ifndef XF86DRI_DEVEL
|
||||
if (w != pGlint->startxsub) {
|
||||
GLINT_WRITE_REG(w<<16, StartXSub);
|
||||
pGlint->startxsub = w;
|
||||
@ -321,20 +316,6 @@ static void TXLoadCoord(
|
||||
GLINT_WRITE_REG(d<<16,dY);
|
||||
pGlint->dy = d;
|
||||
}
|
||||
#else
|
||||
GLINT_WRITE_REG(w<<16, StartXSub);
|
||||
GLINT_WRITE_REG(x<<16,StartXDom);
|
||||
GLINT_WRITE_REG(y<<16,StartY);
|
||||
GLINT_WRITE_REG(h,GLINTCount);
|
||||
GLINT_WRITE_REG(a<<16,dXDom);
|
||||
GLINT_WRITE_REG(d<<16,dY);
|
||||
pGlint->startxsub = w;
|
||||
pGlint->startxdom = x;
|
||||
pGlint->starty = y;
|
||||
pGlint->count = h;
|
||||
pGlint->dxdom = a;
|
||||
pGlint->dy = d;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
* this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
|
||||
* Siemens Nixdorf Informationssysteme
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.15tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@ -36,7 +35,6 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
#include "IBM.h"
|
||||
@ -165,7 +163,7 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg)
|
||||
/* Override FBModeSel for 300SX chip */
|
||||
if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
|
||||
((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) &&
|
||||
(pGlint->MultiChip == PCI_CHIP_300SX)) ) {
|
||||
(pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ) {
|
||||
switch (pScrn->bitsPerPixel) {
|
||||
case 8:
|
||||
STOREREG(FBModeSel, 0x905);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user