xserver-xorg-video-nv: Changes to 'debian-unstable'
ChangeLog | 192 +++++++++++++++++++
Makefile.am | 2
Makefile.in | 9
README.G80 | 5
compat/.gitignore | 2
compat/Makefile.am | 15 +
compat/Makefile.in | 355 +++++++++++++++++++++++++++++++++++
compat/README | 7
config.guess | 32 ++-
config.h.in | 15 -
config.sub | 16 +
configure | 299 ++++++++++++++++++------------
configure.ac | 72 +++++--
debian/changelog | 12 +
debian/control | 2
man/Makefile.am | 9
man/Makefile.in | 12 -
man/nv.man | 29 +-
src/Makefile.am | 31 ++-
src/Makefile.in | 155 ++++++++++++---
src/g80_cursor.c | 150 +++------------
src/g80_cursor.h | 8
src/g80_dac.c | 199 ++++++++++++++++++++
src/g80_ddc.c | 230 -----------------------
src/g80_ddc.h | 1
src/g80_display.c | 485 +++++++++++++++++++++++++------------------------
src/g80_display.h | 22 +-
src/g80_driver.c | 239 ++++++++++++++----------
src/g80_exa.c | 329 +++++++++++++++++++++++++++++++++
src/g80_exa.h | 1
src/g80_output.c | 350 +++++++++++++++++++++++++++++++++++
src/g80_output.h | 31 +++
src/g80_sor.c | 301 ++++++++++++++++++++++++++++++
src/g80_type.h | 40 ++--
src/g80_xaa.c | 10 -
src/g80_xaa.h | 5
src/local_xf86Rename.h | 23 ++
src/nv_dac.c | 3
src/nv_driver.c | 236 ++++++++++++++++++++---
src/nv_hw.c | 19 +
src/nv_include.h | 6
src/nv_local.h | 3
src/nv_setup.c | 3
src/nv_type.h | 11 +
src/nv_video.c | 13 -
src/riva_hw.c | 2
src/riva_include.h | 5
src/riva_local.h | 3
48 files changed, 2984 insertions(+), 1015 deletions(-)
New commits:
commit f48e652e259e98fd883179b95ebd37d877c07337
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue Jun 19 19:12:07 2007 +0200
New upstream release
diff --git a/configure b/configure
index 3d7f65a..d409d13 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.0.96.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-nv'
PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.0.96'
-PACKAGE_STRING='xf86-video-nv 2.0.96'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='xf86-video-nv 2.1.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.0.96 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1487,7 +1487,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.0.96:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.0:";;
esac
cat <<\_ACEOF
@@ -1601,7 +1601,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nv configure 2.0.96
+xf86-video-nv configure 2.1.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1615,7 +1615,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-nv $as_me 2.0.96, which was
+It was created by xf86-video-nv $as_me 2.1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2290,7 +2290,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nv'
- VERSION='2.0.96'
+ VERSION='2.1.0'
cat >>confdefs.h <<_ACEOF
@@ -21292,7 +21292,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-nv $as_me 2.0.96, which was
+This file was extended by xf86-video-nv $as_me 2.1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21345,7 +21345,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-nv config.status 2.0.96
+xf86-video-nv config.status 2.1.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index f2cd84d..852ffc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 19 Jun 2007 19:11:56 +0200
+
xserver-xorg-video-nv (1:2.0.96-1) experimental; urgency=low
[ Timo Aaltonen ]
commit 209c84e788faf3c4d0ce053e5f29ff5f5b798628
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 18 13:08:31 2007 -0700
Bump to 2.1.0.
diff --git a/configure.ac b/configure.ac
index 66a1efb..0b5c14b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.0.96,
+ 2.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
commit 24770ccf880f056bc0db9464249caca10692fb56
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 18 12:36:29 2007 -0700
Fix some random colormap corruption on DFPs with certain pre-G80 GPUs.
diff --git a/src/nv_dac.c b/src/nv_dac.c
index 3fb687f..e1f0740 100644
--- a/src/nv_dac.c
+++ b/src/nv_dac.c
@@ -1,6 +1,6 @@
/***************************************************************************\
|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
+|* Copyright 2007 NVIDIA, Corporation. All rights reserved. *|
|* *|
|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
|* international laws. Users and possessors of this source code are *|
@@ -221,6 +221,7 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
nvReg->crtcSync = pNv->PRAMDAC[0x0828/4];
nvReg->crtcSync += NVDACPanelTweaks(pNv, nvReg);
+ nvReg->crtcVSync = pNv->fpVTotal - 6;
}
nvReg->vpll = nvReg->pll;
diff --git a/src/nv_hw.c b/src/nv_hw.c
index ae499fa..63f9067 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -1501,6 +1501,7 @@ void NVLoadStateExt (
} else {
pNv->PRAMDAC[0x0848/4] = state->scale;
pNv->PRAMDAC[0x0828/4] = state->crtcSync;
+ pNv->PRAMDAC[0x0808/4] = state->crtcVSync;
}
pNv->PRAMDAC[0x0600/4] = state->general;
@@ -1588,6 +1589,7 @@ void NVUnloadStateExt
if(pNv->FlatPanel) {
state->crtcSync = pNv->PRAMDAC[0x0828/4];
+ state->crtcVSync = pNv->PRAMDAC[0x0808/4];
}
}
diff --git a/src/nv_setup.c b/src/nv_setup.c
index 71d7955..1bf58e0 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -687,6 +687,7 @@ NVCommonSetup(ScrnInfoPtr pScrn)
if(pNv->FlatPanel && !pNv->Television) {
pNv->fpWidth = pNv->PRAMDAC[0x0820/4] + 1;
pNv->fpHeight = pNv->PRAMDAC[0x0800/4] + 1;
+ pNv->fpVTotal = pNv->PRAMDAC[0x804/4] + 1;
pNv->fpSyncs = pNv->PRAMDAC[0x0848/4] & 0x30000033;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Panel size is %i x %i\n",
pNv->fpWidth, pNv->fpHeight);
diff --git a/src/nv_type.h b/src/nv_type.h
index b10babc..b4f1cd3 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -70,6 +70,7 @@ typedef struct _riva_hw_state
U032 timingV;
U032 displayV;
U032 crtcSync;
+ U032 crtcVSync;
} RIVA_HW_STATE, *NVRegPtr;
@@ -161,6 +162,7 @@ typedef struct {
Bool fpScaler;
int fpWidth;
int fpHeight;
+ CARD32 fpVTotal;
CARD32 fpSyncs;
Bool usePanelTweak;
int PanelTweak;
commit fa1fff442c6332419da0b5d3d988237b0bbf8129
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 9 05:23:36 2007 +0200
Fix leftover from merge(?).
diff --git a/src/nv_include.h b/src/nv_include.h
index 6ad41ba..648ac31 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -51,7 +51,6 @@
#include "vgaHW.h"
#include "xf86Cursor.h"
-#include "xf86DDC.h"
#include "region.h"
commit 399210e45796a3ec676fd6b6dceb3fb131472761
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 9 04:06:59 2007 +0200
Add missing Makefile.in
diff --git a/compat/Makefile.in b/compat/Makefile.in
new file mode 100644
index 0000000..cd346db
--- /dev/null
+++ b/compat/Makefile.in
@@ -0,0 +1,355 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+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_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = compat
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
+BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRIVER_NAME = @DRIVER_NAME@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XMODES_CFLAGS = @XMODES_CFLAGS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+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@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+modes_dir = @modes_dir@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+parser_dir = @parser_dir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu compat/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu compat/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/modes $(distdir)/parser
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
+
+# 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:
commit 02b18712460f3d3e1a281780b8aad5e3f42fc1eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 9 04:03:06 2007 +0200
Update upstream changelog, and prepare debian changelog for upload.
diff --git a/ChangeLog b/ChangeLog
index 54f7992..ead5a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 9b8470e9c81e6ce2c8cd69942fb2ffd2d4c06102
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed May 16 14:45:36 2007 -0700
+
+ Bump to 2.0.96.
+
+commit 51c6425bea6e4ef02f7b76e58e759f99b0e993e8
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu May 10 17:09:36 2007 -0700
+
+ Add rudimentary VBE-based dual head support for pre-G80.
+
commit 0415ecaead518123ac6774300241867883a6dd57
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu May 3 11:54:28 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index 4b36d2a..f2cd84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.0.96-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.0.96-1) experimental; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-nv.
@@ -17,7 +17,7 @@ xserver-xorg-video-nv (1:2.0.96-1) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 22 May 2007 09:02:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 09 Jun 2007 04:01:39 +0200
xserver-xorg-video-nv (1:2.0.2-1) unstable; urgency=low
commit 4e56465a79587c4df6bf1dfd7cc87a4f22707a8f
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jun 7 18:28:56 2007 -0700
G80: Mode validation.
Disable LVDS modes larger than the native resolution.
Disable dual-link TMDS modes for now since they don't work reliably.
diff --git a/src/g80_output.c b/src/g80_output.c
index 6a2723b..11bdb25 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -164,8 +164,10 @@ G80OutputSetPClk(xf86OutputPtr output, int pclk)
int
G80OutputModeValid(xf86OutputPtr output, DisplayModePtr mode)
{
- if(mode->Clock > 400000 || mode->Clock < 25000)
- return MODE_CLOCK_RANGE;
+ if(mode->Clock > 400000)
+ return MODE_CLOCK_HIGH;
+ if(mode->Clock < 25000)
+ return MODE_CLOCK_LOW;
return MODE_OK;
}
diff --git a/src/g80_sor.c b/src/g80_sor.c
index a51e5e0..2ab9f2e 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -65,6 +65,30 @@ G80SorDPMSSet(xf86OutputPtr output, int mode)
while((pNv->reg[(0x61C030+off)/4] & 0x10000000));
}
+static int
+G80TMDSModeValid(xf86OutputPtr output, DisplayModePtr mode)
+{
+ // Disable dual-link modes until I can find a way to make them work
+ // reliably.
+ if (mode->Clock > 165000)
+ return MODE_CLOCK_HIGH;
+
+ return G80OutputModeValid(output, mode);
+}
+
+static int
+G80LVDSModeValid(xf86OutputPtr output, DisplayModePtr mode)
+{
+ G80OutputPrivPtr pPriv = output->driver_private;
+ DisplayModePtr native = pPriv->nativeMode;
+
+ // Ignore modes larger than the native res.
+ if (mode->HDisplay > native->HDisplay || mode->VDisplay > native->VDisplay)
+ return MODE_PANEL;
+
+ return G80OutputModeValid(output, mode);
+}
+
static void
G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
DisplayModePtr adjusted_mode)
@@ -180,7 +204,7 @@ static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
.dpms = G80SorDPMSSet,
.save = NULL,
.restore = NULL,
- .mode_valid = G80OutputModeValid,
+ .mode_valid = G80TMDSModeValid,
.mode_fixup = G80OutputModeFixup,
.prepare = G80OutputPrepare,
.commit = G80OutputCommit,
@@ -194,7 +218,7 @@ static const xf86OutputFuncsRec G80SorLVDSOutputFuncs = {
.dpms = G80SorDPMSSet,
.save = NULL,
.restore = NULL,
- .mode_valid = G80OutputModeValid,
+ .mode_valid = G80LVDSModeValid,
.mode_fixup = G80SorModeFixupScale,
.prepare = G80OutputPrepare,
.commit = G80OutputCommit,
commit 6b71721439802bffd715602af3036083ff442449
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 4 23:15:42 2007 -0700
G80: LVDS support.
diff --git a/src/g80_output.c b/src/g80_output.c
index d68250f..6a2723b 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -85,6 +85,7 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
"for port %i\n",
or, pNv->i2cMap[port].sor, port);
pNv->i2cMap[port].sor = or;
+ pNv->i2cMap[port].panelType = (type == 2) ? TMDS : LVDS;
break;
}
}
@@ -317,7 +318,8 @@ G80CreateOutputs(ScrnInfoPtr pScrn)
if(pNv->i2cMap[i].dac != -1)
dac = G80CreateDac(pScrn, pNv->i2cMap[i].dac);
if(pNv->i2cMap[i].sor != -1)
- sor = G80CreateSor(pScrn, pNv->i2cMap[i].sor);
+ sor = G80CreateSor(pScrn, pNv->i2cMap[i].sor,
+ pNv->i2cMap[i].panelType);
if(dac) {
G80OutputPrivPtr pPriv = dac->driver_private;
diff --git a/src/g80_output.h b/src/g80_output.h
index 0b666f5..900b76d 100644
--- a/src/g80_output.h
+++ b/src/g80_output.h
@@ -1,6 +1,8 @@
typedef struct G80OutputPrivRec {
ORType type;
ORNum or;
+ PanelType panelType;
+ DisplayModePtr nativeMode;
xf86OutputPtr partner;
I2CBusPtr i2c;
@@ -26,4 +28,4 @@ xf86OutputPtr G80CreateDac(ScrnInfoPtr, ORNum);
Bool G80DacLoadDetect(xf86OutputPtr);
/* g80_sor.c */
-xf86OutputPtr G80CreateSor(ScrnInfoPtr, ORNum);
+xf86OutputPtr G80CreateSor(ScrnInfoPtr, ORNum, PanelType);
diff --git a/src/g80_sor.c b/src/g80_sor.c
index ea7e015..a51e5e0 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -38,8 +38,9 @@ G80SorSetPClk(xf86OutputPtr output, int pclk)
G80Ptr pNv = G80PTR(output->scrn);
G80OutputPrivPtr pPriv = output->driver_private;
const int orOff = 0x800 * pPriv->or;
+ const int limit = pPriv->panelType == LVDS ? 112000 : 165000;
- pNv->reg[(0x00614300+orOff)/4] = (pclk > 165000) ? 0x101 : 0;
+ pNv->reg[(0x00614300+orOff)/4] = (pclk > limit) ? 0x101 : 0;
}
static void
@@ -61,6 +62,7 @@ G80SorDPMSSet(xf86OutputPtr output, int mode)
tmp &= ~1;
pNv->reg[(0x0061C004+off)/4] = tmp;
+ while((pNv->reg[(0x61C030+off)/4] & 0x10000000));
}
static void
@@ -70,6 +72,7 @@ G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
ScrnInfoPtr pScrn = output->scrn;
G80OutputPrivPtr pPriv = output->driver_private;
const int sorOff = 0x40 * pPriv->or;
+ CARD32 type;
if(!adjusted_mode) {
/* Disconnect the SOR */
@@ -77,6 +80,13 @@ G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
return;
}
+ if(pPriv->panelType == LVDS)
+ type = 0;
+ else if(adjusted_mode->Clock > 165000)
+ type = 0x500;
+ else
+ type = 0x100;
+
// This wouldn't be necessary, but the server is stupid and calls
// G80SorDPMSSet after the output is disconnected, even though the hardware
// turns it off automatically.
@@ -84,7 +94,7 @@ G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
C(0x00000600 + sorOff,
(G80CrtcGetHead(output->crtc) == HEAD0 ? 1 : 2) |
- (adjusted_mode->Clock > 165000 ? 0x500 : 0x100) |
+ type |
((adjusted_mode->Flags & V_NHSYNC) ? 0x1000 : 0) |
((adjusted_mode->Flags & V_NVSYNC) ? 0x2000 : 0));
}
@@ -92,7 +102,6 @@ G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
static xf86OutputStatus
G80SorDetect(xf86OutputPtr output)
{
-
G80OutputPrivPtr pPriv = output->driver_private;
/* Assume physical status isn't going to change before the BlockHandler */
@@ -103,16 +112,71 @@ G80SorDetect(xf86OutputPtr output)
return pPriv->cached_status;
}
+static xf86OutputStatus
+G80SorLVDSDetect(xf86OutputPtr output)
+{
+ /* Assume LVDS is always connected */
+ return XF86OutputStatusConnected;
+}
+
static void
G80SorDestroy(xf86OutputPtr output)
{
+ G80OutputPrivPtr pPriv = output->driver_private;
+
G80OutputDestroy(output);
+ if(pPriv->nativeMode) {
+ if(pPriv->nativeMode->name)
+ xfree(pPriv->nativeMode->name);
+ xfree(pPriv->nativeMode);
+ }
+
xfree(output->driver_private);
output->driver_private = NULL;
}
-static const xf86OutputFuncsRec G80SorOutputFuncs = {
+/******************** LVDS ********************/
+static Bool
+G80SorModeFixupScale(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ G80OutputPrivPtr pPriv = output->driver_private;
+ DisplayModePtr native = pPriv->nativeMode;
+
+ // Stash the saved mode timings in adjusted_mode
+ adjusted_mode->Clock = native->Clock;
+ adjusted_mode->Flags = native->Flags;
+ adjusted_mode->CrtcHDisplay = native->CrtcHDisplay;
+ adjusted_mode->CrtcHBlankStart = native->CrtcHBlankStart;
+ adjusted_mode->CrtcHSyncStart = native->CrtcHSyncStart;
+ adjusted_mode->CrtcHSyncEnd = native->CrtcHSyncEnd;
+ adjusted_mode->CrtcHBlankEnd = native->CrtcHBlankEnd;
+ adjusted_mode->CrtcHTotal = native->CrtcHTotal;
+ adjusted_mode->CrtcHSkew = native->CrtcHSkew;
+ adjusted_mode->CrtcVDisplay = native->CrtcVDisplay;
+ adjusted_mode->CrtcVBlankStart = native->CrtcVBlankStart;
+ adjusted_mode->CrtcVSyncStart = native->CrtcVSyncStart;
+ adjusted_mode->CrtcVSyncEnd = native->CrtcVSyncEnd;
+ adjusted_mode->CrtcVBlankEnd = native->CrtcVBlankEnd;
+ adjusted_mode->CrtcVTotal = native->CrtcVTotal;
+ adjusted_mode->CrtcHAdjusted = native->CrtcHAdjusted;
+ adjusted_mode->CrtcVAdjusted = native->CrtcVAdjusted;
+
+ // This mode is already "fixed"
+ G80CrtcSkipModeFixup(output->crtc);
+
+ return TRUE;
+}
+
+static DisplayModePtr
+G80SorGetLVDSModes(xf86OutputPtr output)
+{
+ G80OutputPrivPtr pPriv = output->driver_private;
+ return xf86DuplicateMode(pPriv->nativeMode);
+}
+
+static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
.dpms = G80SorDPMSSet,
.save = NULL,
.restore = NULL,
@@ -126,33 +190,88 @@ static const xf86OutputFuncsRec G80SorOutputFuncs = {
.destroy = G80SorDestroy,
};
+static const xf86OutputFuncsRec G80SorLVDSOutputFuncs = {
+ .dpms = G80SorDPMSSet,
+ .save = NULL,
+ .restore = NULL,
+ .mode_valid = G80OutputModeValid,
+ .mode_fixup = G80SorModeFixupScale,
+ .prepare = G80OutputPrepare,
+ .commit = G80OutputCommit,
+ .mode_set = G80SorModeSet,
+ .detect = G80SorLVDSDetect,
+ .get_modes = G80SorGetLVDSModes,
+ .destroy = G80SorDestroy,
+};
+
+static DisplayModePtr
+GetLVDSNativeMode(G80Ptr pNv)
+{
+ DisplayModePtr mode = xnfcalloc(1, sizeof(DisplayModeRec));
+ const CARD32 size = pNv->reg[0x00610B4C/4];
+ const int width = size & 0x3fff;
+ const int height = (size >> 16) & 0x3fff;
+
+ mode->HDisplay = mode->CrtcHDisplay = width;
+ mode->VDisplay = mode->CrtcVDisplay = height;
+ mode->Clock = pNv->reg[0x610AD4/4] & 0x3fffff;
+ mode->CrtcHBlankStart = pNv->reg[0x610AFC/4];
+ mode->CrtcHSyncEnd = pNv->reg[0x610B04/4];
+ mode->CrtcHBlankEnd = pNv->reg[0x610AE8/4];
+ mode->CrtcHTotal = pNv->reg[0x610AF4/4];
+
+ mode->next = mode->prev = NULL;
+ mode->status = MODE_OK;
+ mode->type = M_T_DRIVER | M_T_PREFERRED;
+
+ xf86SetModeDefaultName(mode);
+
+ return mode;
+}
+
xf86OutputPtr
-G80CreateSor(ScrnInfoPtr pScrn, ORNum or)
+G80CreateSor(ScrnInfoPtr pScrn, ORNum or, PanelType panelType)
{
G80Ptr pNv = G80PTR(pScrn);
Reply to: