xf86-video-nv: Branch 'randr-1.2' - 5 commits - compat/.gitignore compat/Makefile.am compat/README configure.ac Makefile.am man/Makefile.am man/nv.man src/g80_ddc.h src/g80_display.h src/g80_driver.c src/g80_output.c src/local_xf86Rename.h src/Makefile.am src/nv_driver.c src/nv_include.h src/nv_local.h src/nv_video.c src/riva_include.h src/riva_local.h
Aaron Plattner
aplattner at kemper.freedesktop.org
Sat Apr 21 02:28:50 EEST 2007
Makefile.am | 2 -
compat/.gitignore | 2 +
compat/Makefile.am | 15 ++++++++++
compat/README | 7 +++++
configure.ac | 67 +++++++++++++++++++++++++++++++++++--------------
man/Makefile.am | 9 ------
man/nv.man | 6 ----
src/Makefile.am | 23 +++++++++++++++-
src/g80_ddc.h | 1
src/g80_display.h | 1
src/g80_driver.c | 2 -
src/g80_output.c | 1
src/local_xf86Rename.h | 23 ++++++++++++++++
src/nv_driver.c | 9 ------
src/nv_include.h | 5 ---
src/nv_local.h | 3 --
src/nv_video.c | 13 +--------
src/riva_include.h | 5 ---
src/riva_local.h | 3 --
19 files changed, 122 insertions(+), 75 deletions(-)
New commits:
diff-tree 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5 (from 48f9a6f94550acea4fce81d2539a6508049c1551)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Apr 20 16:24:15 2007 -0700
Depend on server 1.2 or higher.
Remove support for building with the libc wrapper or without the Drawable XV
argument.
diff --git a/configure.ac b/configure.ac
index b4fd037..5370beb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,14 +59,8 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
-# the libcwrapper.
-PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
- [AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
- [AC_DEFINE(USE_LIBC_WRAPPER,1,[Use the libc wrapper])])
-
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/nv_include.h b/src/nv_include.h
index 03f2997..648ac31 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -3,19 +3,14 @@
#ifndef __NV_INCLUDE_H__
#define __NV_INCLUDE_H__
-#if !USE_LIBC_WRAPPER
#include <string.h>
#include <math.h>
#include <unistd.h>
-#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff --git a/src/nv_local.h b/src/nv_local.h
index 6cb0264..3d5d202 100644
--- a/src/nv_local.h
+++ b/src/nv_local.h
@@ -46,9 +46,6 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86_OSproc.h"
diff --git a/src/nv_video.c b/src/nv_video.c
index 1a428fb..c9ee5fe 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -7,9 +7,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
@@ -83,11 +80,7 @@ static int NVGetBlitPortAttribute(ScrnI
static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool);
-#if HAVE_XV_DRAWABLE
static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
-#else
-static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
-#endif
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
@@ -1012,10 +1005,8 @@ static int NVPutImage
short height,
Bool Sync,
RegionPtr clipBoxes,
- pointer data
-#if HAVE_XV_DRAWABLE
- , DrawablePtr pDraw
-#endif
+ pointer data,
+ DrawablePtr pDraw
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
diff --git a/src/riva_include.h b/src/riva_include.h
index 675899b..2f269df 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -3,17 +3,12 @@
#ifndef __RIVA_INCLUDE_H__
#define __RIVA_INCLUDE_H__
-#if !USE_LIBC_WRAPPER
#include <string.h>
-#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff --git a/src/riva_local.h b/src/riva_local.h
index bdfe2b9..833ed04 100644
--- a/src/riva_local.h
+++ b/src/riva_local.h
@@ -46,9 +46,6 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86_OSproc.h"
diff-tree 48f9a6f94550acea4fce81d2539a6508049c1551 (from 7a07a765c2a3816e8cd0487e8f66bc767024142d)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Apr 20 15:37:09 2007 -0700
G80: Remove AdjustFrame printout.
diff --git a/src/g80_display.h b/src/g80_display.h
index 99436be..fac7877 100644
--- a/src/g80_display.h
+++ b/src/g80_display.h
@@ -11,6 +11,5 @@ void G80CrtcBlankScreen(xf86CrtcPtr, Boo
void G80CrtcEnableCursor(xf86CrtcPtr, Bool update);
void G80CrtcDisableCursor(xf86CrtcPtr, Bool update);
void G80CrtcSetCursorPosition(xf86CrtcPtr, int x, int y);
-void G80CrtcSetDither(xf86CrtcPtr, CARD32 mask, CARD32 val);
void G80DispCreateCrtcs(ScrnInfoPtr pScrn);
diff --git a/src/g80_driver.c b/src/g80_driver.c
index b79fa9c..9ce23ff 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -842,7 +842,6 @@ G80SwitchMode(int scrnIndex, DisplayMode
static void
G80AdjustFrame(int scrnIndex, int x, int y, int flags)
{
- ErrorF("AdjustFrame unimplemented\n");
}
static Bool
diff-tree 7a07a765c2a3816e8cd0487e8f66bc767024142d (from 2971fd0a18e947c5d39d6af78b0b77d6e4fe00d8)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Apr 20 14:30:45 2007 -0700
Steal RandR1.2 compat code from the Intel driver.
Spruce it up a bit so that --with-xserver-source works even if there's a local
compat copy.
diff --git a/Makefile.am b/Makefile.am
index 3924813..5acfc99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man compat
EXTRA_DIST = README.NV1 ChangeLog
diff --git a/compat/.gitignore b/compat/.gitignore
new file mode 100644
index 0000000..8d30df6
--- /dev/null
+++ b/compat/.gitignore
@@ -0,0 +1,2 @@
+modes
+parser
diff --git a/compat/Makefile.am b/compat/Makefile.am
new file mode 100644
index 0000000..f5f8d93
--- /dev/null
+++ b/compat/Makefile.am
@@ -0,0 +1,15 @@
+EXTRA_DIST = \
+ parser/xf86Parser.h \
+ parser/xf86Optrec.h \
+ modes/xf86Crtc.c \
+ modes/xf86Crtc.h \
+ modes/xf86Cursors.c \
+ modes/xf86cvt.c \
+ modes/xf86DiDGA.c \
+ modes/xf86EdidModes.c \
+ modes/xf86Modes.c \
+ modes/xf86Modes.h \
+ modes/xf86RandR12.c \
+ modes/xf86RandR12.h \
+ modes/xf86Rename.h \
+ modes/xf86Rotate.c
diff --git a/compat/README b/compat/README
new file mode 100644
index 0000000..3e2b089
--- /dev/null
+++ b/compat/README
@@ -0,0 +1,7 @@
+This directory contains a copy of the mode and parser code from RandR 1.2.
+
+If you are building from git and you don't have xorg-server-1.3 or higher or you
+want to be able to make dist, you should create symlinks to the modes and parser
+directories from a RandR 1.2-enabled server here:
+
+ $ ln -s /path/to/xorg/xserver/hw/xfree86/{modes,parser} .
diff --git a/configure.ac b/configure.ac
index 9bb243a..b4fd037 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,12 +41,18 @@ AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
+# Options
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
+ [Path to X server source tree]),
+ [ XSERVER_SOURCE="$withval" ],
+ [ XSERVER_SOURCE="" ])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -68,6 +74,47 @@ sdkdir=$(pkg-config --variable=sdkdir xo
# Checks for header files.
AC_HEADER_STDC
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADER(xf86Modes.h,[BUILD_XMODES=no],[BUILD_XMODES=yes],[#include "xorg-server.h"])
+CFLAGS="$save_CFLAGS"
+AM_CONDITIONAL(BUILD_XMODES, test "x$BUILD_XMODES" = xyes)
+if test "x$XSERVER_SOURCE" != x; then
+ if test -d "$XSERVER_SOURCE"; then
+ XSERVER_SOURCE=`cd "$XSERVER_SOURCE" && pwd`
+ if test -f "$XSERVER_SOURCE/hw/xfree86/modes/xf86Modes.h" -a -f "$XSERVER_SOURCE/hw/xfree86/parser/xf86Parser.h"; then
+ :
+ else
+ AC_ERROR([Server source at $XSERVER_SOURCE doesn't have the new mode code])
+ fi
+ else
+ AC_ERROR([Can't find xserver-source path $XSERVER_SOURCE])
+ fi
+fi
+if test "x$BUILD_XMODES" = xno; then
+ AC_MSG_NOTICE([X server has new mode code])
+ XMODES_CFLAGS=
+ parser_dir=
+ modes_dir=
+else
+ if test "x$XSERVER_SOURCE" = x; then
+ AC_MSG_NOTICE([X server is missing new mode code and --with-xserver-source not specified, using local copy])
+ AC_MSG_NOTICE([If you're building from git, please read compat/README])
+ parser_dir='$(top_srcdir)/compat/parser'
+ modes_dir='$(top_srcdir)/compat/modes'
+ else
+ AC_MSG_NOTICE([Using mode code from $XSERVER_SOURCE])
+ parser_dir="$XSERVER_SOURCE/hw/xfree86/parser"
+ modes_dir="$XSERVER_SOURCE/hw/xfree86/modes"
+ fi
+ XMODES_CFLAGS="-DXF86_MODES_RENAME -I\"$modes_dir\" -I\"$parser_dir\""
+ AC_DEFINE(BUILD_XMODES, 1,[X server doesn't have built-in mode code, so we need to build it])
+fi
+AC_SUBST([XMODES_CFLAGS])
+AC_SUBST([parser_dir])
+AC_SUBST([modes_dir])
+
+# Substitutions
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
@@ -81,4 +128,5 @@ AC_OUTPUT([
Makefile
src/Makefile
man/Makefile
+ compat/Makefile
])
diff --git a/src/Makefile.am b/src/Makefile.am
index b31ebea..52b6b47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
# -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@
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@
nv_drv_la_LTLIBRARIES = nv_drv.la
nv_drv_la_LDFLAGS = -module -avoid-version
nv_drv_ladir = @moduledir@/drivers
@@ -81,3 +81,24 @@ g80_sources = \
g80_type.h \
g80_xaa.c \
g80_xaa.h
+
+xmode_sources = \
+ @parser_dir@/xf86Parser.h \
+ @parser_dir@/xf86Optrec.h \
+ @modes_dir@/xf86Modes.h \
+ @modes_dir@/xf86Modes.c \
+ @modes_dir@/xf86cvt.c \
+ @modes_dir@/xf86Crtc.h \
+ @modes_dir@/xf86Crtc.c \
+ @modes_dir@/xf86Cursors.c \
+ @modes_dir@/xf86EdidModes.c \
+ @modes_dir@/xf86RandR12.c \
+ @modes_dir@/xf86RandR12.h \
+ @modes_dir@/xf86Rename.h \
+ @modes_dir@/xf86Rotate.c \
+ @modes_dir@/xf86DiDGA.c
+
+if BUILD_XMODES
+EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
+nodist_nv_drv_la_SOURCES = $(xmode_sources)
+endif
diff --git a/src/local_xf86Rename.h b/src/local_xf86Rename.h
new file mode 100644
index 0000000..f3a07c6
--- /dev/null
+++ b/src/local_xf86Rename.h
@@ -0,0 +1,23 @@
+/*
+ *Copyright © 2006 Keith Packard
+ *
+ * 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 the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.
+ */
+
+#define XF86NAME(x) nv_##x
diff-tree 2971fd0a18e947c5d39d6af78b0b77d6e4fe00d8 (from ae582bdd2107d7e0106d1d5a9a9d6b9e39f1c901)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Apr 20 13:40:33 2007 -0700
Remove unused g80_ddc.h.
diff --git a/src/g80_ddc.h b/src/g80_ddc.h
deleted file mode 100644
index d209d62..0000000
--- a/src/g80_ddc.h
+++ /dev/null
@@ -1 +0,0 @@
-Bool G80ProbeDDC(ScrnInfoPtr pScrn);
diff --git a/src/g80_driver.c b/src/g80_driver.c
index a3d86c7..b79fa9c 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -43,7 +43,6 @@
#include "g80_type.h"
#include "g80_cursor.h"
#include "g80_display.h"
-#include "g80_ddc.h"
#include "g80_dma.h"
#include "g80_output.h"
#include "g80_xaa.h"
diff --git a/src/g80_output.c b/src/g80_output.c
index a3b28a5..fd32f98 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -30,7 +30,6 @@
#include <xf86DDC.h>
#include "g80_type.h"
-#include "g80_ddc.h"
#include "g80_output.h"
static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
diff-tree ae582bdd2107d7e0106d1d5a9a9d6b9e39f1c901 (from f7c62016f8bf9ced7d56f74ce26e13b6df040379)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Apr 20 00:13:31 2007 -0700
Always support G80.
diff --git a/configure.ac b/configure.ac
index 6b1f98e..9bb243a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,17 +63,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99.
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-# Check for optional compile-time support
-AC_ARG_ENABLE(g80, AC_HELP_STRING([--disable-g80],
- [Disable G80 support [[default=no]]]),
- [SUPPORT_G80="$enableval"],
- [SUPPORT_G80=yes])
-AM_CONDITIONAL(SUPPORT_G80, test x$SUPPORT_G80 = xyes)
-if test "$SUPPORT_G80" = yes; then
- AC_DEFINE(SUPPORT_G80,1,[Enable G80 support])
- echo "Enabling G80 support"
-fi
-
# Checks for libraries.
# Checks for header files.
diff --git a/man/Makefile.am b/man/Makefile.am
index 036545c..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -41,12 +41,6 @@ SED = sed
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
-if SUPPORT_G80
-MAN_SUPPORT_G80 := 1
-else
-MAN_SUPPORT_G80 := 0
-endif
-
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -57,8 +51,7 @@ MAN_SUBSTS = \
-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' \
- -e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
diff --git a/man/nv.man b/man/nv.man
index e892ecf..c8d2fcb 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -58,12 +58,9 @@ NV40, NV41, NV43, NV44, NV45, C51
.TP 22
.B GeForce 7XXX
G70, G71, G72, G73
-.de G8
.TP 22
.B GeForce 8XXX
G80
-..
-.if __support_g80__ .G8
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
@@ -136,7 +133,6 @@ Default: no rotation support.
Enable or disable use of the shadow framebuffer layer. Default: off.
.
.\" ******************** begin G80 section ********************
-.de G8
.PP
The following driver
.B Options
@@ -147,8 +143,6 @@ Enable or disable the hardware cursor.
.TP
.BI "Option \*qNoAccel\*q \*q" boolean \*q
Disable or enable acceleration. Default: acceleration is enabled.
-..
-.if __support_g80__ .G8
.\" ******************** end G80 section ********************
.
.SH "SEE ALSO"
diff --git a/src/Makefile.am b/src/Makefile.am
index d024283..b31ebea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,6 @@ riva_sources = \
riva_type.h \
riva_xaa.c
-if SUPPORT_G80
g80_sources = \
g80_cursor.c \
g80_cursor.h \
@@ -82,4 +81,3 @@ g80_sources = \
g80_type.h \
g80_xaa.c \
g80_xaa.h
-endif
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 64d45c5..f9fdc7e 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -333,12 +333,11 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0244, "GeForce Go 6150" },
{ 0x10DE0247, "GeForce Go 6100" },
-#if SUPPORT_G80
+/*************** G8x ***************/
{ 0x10DE0191, "GeForce 8800 GTX" },
{ 0x10DE0193, "GeForce 8800 GTS" },
{ 0x10DE019D, "Quadro FX 5600" },
{ 0x10DE019E, "Quadro FX 4600" },
-#endif
{-1, NULL}
};
@@ -655,7 +654,6 @@ NVGetPCIXpressChip (pciVideoPtr pVideo)
return pciid;
}
-#if SUPPORT_G80
static Bool
NVIsG80(int chipType)
{
@@ -668,7 +666,6 @@ NVIsG80(int chipType)
return FALSE;
}
-#endif
/* Mandatory */
static Bool
@@ -754,10 +751,8 @@ NVProbe(DriverPtr drv, int flags)
default: break; /* we don't recognize it */
}
-#if SUPPORT_G80
if(NVIsG80((*ppPci)->chipType))
canHandle = TRUE;
-#endif
if(canHandle) {
NVChipsets[numUsed].token = pciid;
@@ -795,11 +790,9 @@ NVProbe(DriverPtr drv, int flags)
if(pPci->vendor == PCI_VENDOR_NVIDIA_SGS) {
if(RivaGetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
-#if SUPPORT_G80
} else if (NVIsG80(pPci->chipType)) {
if(G80GetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
-#endif
} else {
if(NVGetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
More information about the xorg-commit
mailing list