Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit xorg-x11-driver-video
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sun, 11 Mar 2007 00:13:49 +0100
  • Message-id: <20070310231349.81B42678188@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xorg-x11-driver-video
checked in at Sun Mar 11 00:13:49 CET 2007.

--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-06 11:37:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-10 16:18:29.604304000 +0100
@@ -1,0 +2,15 @@
+Sat Mar 10 16:17:57 CET 2007 - sndirsch@xxxxxxx
+
+- xf86-video-nv-DAC.diff:
+ * Use DAC load detection to decide which OR to use instead of
+ trusting the EDID.
+
+-------------------------------------------------------------------
+Fri Mar 9 04:25:21 CET 2007 - sndirsch@xxxxxxx
+
+- updated nv driver to release 1.99.1:
+ * This release adds support for the NVIDIA GeForce 8800 GTX,
+ GeForce 8800 GTS, Quadro FX 4600, and Quadro FX 5600 GPUs. It
+ should be considered beta quality.
+
+-------------------------------------------------------------------

Old:
----
xf86-video-nv-1.2.2.1.tar.bz2

New:
----
xf86-video-nv-1.99.1.tar.bz2
xf86-video-nv-DAC.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.b16665/_old 2007-03-11 00:13:05.000000000 +0100
+++ /var/tmp/diff_new_pack.b16665/_new 2007-03-11 00:13:05.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 59
+Release: 61
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -39,7 +39,7 @@
Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
Source17: xf86-video-nsc-2.8.2.tar.bz2
-Source18: xf86-video-nv-1.2.2.1.tar.bz2
+Source18: xf86-video-nv-1.99.1.tar.bz2
Source19: xf86-video-rendition-4.1.3.tar.bz2
Source20: xf86-video-s3-0.5.0.tar.bz2
Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
@@ -71,6 +71,7 @@
Patch1: radeon-xrandr-dotclock.diff
Patch2: radeon_dell.diff
Patch3: ps_nv.diff
+Patch4: xf86-video-nv-DAC.diff
Patch5: mga-g200se_pci-fix.diff
Patch9: xf86-video-sunffb.diff
Patch10: xf86-video-tdfx.diff
@@ -102,6 +103,7 @@
popd
pushd xf86-video-nv-*/src
%patch3 -p6
+%patch4 -p2
popd
pushd xf86-video-mga-*/src
tar xzf %{SOURCE44}
@@ -127,7 +129,10 @@
popd

%build
-for dir in xf86-video-intel-* $(ls | grep -v -e xf86-video-impact -e xf86-video-intel); do
+for dir in xf86-video-nv-* \
+ $(ls | grep -v -e xf86-video-impact \
+ -e xf86-video-nv \
+ ); do
pushd $dir
case $dir in
xf86-video-mga-* | \
@@ -142,7 +147,10 @@
done

%install
-for dir in xf86-video-intel-* $(ls | grep -v -e xf86-video-impact); do
+for dir in xf86-video-nv-* \
+ $(ls | grep -v -e xf86-video-impact \
+ -e xf86-video-nv \
+ ); do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
ln -snf nv_drv.so \
@@ -227,6 +235,15 @@
%{_mandir}/man4/*

%changelog
+* Sat Mar 10 2007 - sndirsch@xxxxxxx
+- xf86-video-nv-DAC.diff:
+ * Use DAC load detection to decide which OR to use instead of
+ trusting the EDID.
+* Fri Mar 09 2007 - sndirsch@xxxxxxx
+- updated nv driver to release 1.99.1:
+ * This release adds support for the NVIDIA GeForce 8800 GTX,
+ GeForce 8800 GTS, Quadro FX 4600, and Quadro FX 5600 GPUs. It
+ should be considered beta quality.
* Tue Mar 06 2007 - sndirsch@xxxxxxx
- do not overwrite "i810" driver with symlink to "intel" driver; we
still need two different Intel drivers ("i810" + "intel")

++++++ xf86-video-nv-1.2.2.1.tar.bz2 -> xf86-video-nv-1.99.1.tar.bz2 ++++++
++++ 8597 lines of diff (skipped)

++++++ xf86-video-nv-DAC.diff ++++++
src/g80_ddc.c | 25 +++++++++++--------------
src/g80_display.c | 36 +++++++++++++++++++++++-------------
src/g80_display.h | 1 +
3 files changed, 35 insertions(+), 27 deletions(-)

New commits:
diff-tree 8b2c7bc457d34b7ed59cd08719bec8754ebf6fb8 (from 06b168ced3cc4aa47cdad21a2351cca674fa26e0)
Author: Aaron Plattner <aplattner@xxxxxxxxxx>
Date: Fri Mar 9 12:43:12 2007 -0800

Use DAC load detection to decide which OR to use instead of trusting the EDID.

diff --git a/src/g80_ddc.c b/src/g80_ddc.c
index 3713028..bcc4bff 100644
--- a/src/g80_ddc.c
+++ b/src/g80_ddc.c
@@ -197,22 +197,19 @@ Bool G80ProbeDDC(ScrnInfoPtr pScrn)

flatPanel = (monInfo->features.input_type == 1);

- if(flatPanel) {
- if(pNv->i2cMap[port].sor == -1) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Saw a flat panel EDID "
- "on I2C port %i but no SOR outputs were registered for "
- "that port.\n", port);
- continue;
- }
+ if(pNv->i2cMap[port].dac != -1 &&
+ G80DispDetectLoad(pScrn, pNv->i2cMap[port].dac)) {
+ pNv->orType = DAC;
+ pNv->or = pNv->i2cMap[port].dac;
+ } else if(pNv->i2cMap[port].sor != -1) {
pNv->orType = SOR;
pNv->or = pNv->i2cMap[port].sor;
} else {
- if(pNv->i2cMap[port].dac == -1) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Saw a flat panel EDID "
- "on I2C port %i but no DAC outputs were registered for "
- "that port.\n", port);
- continue;
- }
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Saw an EDID on I2C port %i but no DAC load was "
+ "detected and no SOR is connected to this port. Using "
+ "DAC%i.\n", port,
+ pNv->or);
pNv->orType = DAC;
pNv->or = pNv->i2cMap[port].dac;
}
@@ -220,7 +217,7 @@ Bool G80ProbeDDC(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Found a %s on I2C port %i, assigning %s%i\n",
flatPanel ? "flat panel" : "CRT",
- port, flatPanel ? "SOR" : "DAC", pNv->or);
+ port, pNv->orType == SOR ? "SOR" : "DAC", pNv->or);

pScrn->monitor->DDC = monInfo;
xf86SetDDCproperties(pScrn, monInfo);
diff --git a/src/g80_display.c b/src/g80_display.c
index 5ff3514..068e902 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -187,6 +187,28 @@ G80DispCommand(G80Ptr pNv, CARD32 addr,
#define C(mthd, data) G80DispCommand(pNv, (mthd), (data))

/*
+ * Performs load detection on a single DAC.
+ */
+Bool G80DispDetectLoad(ScrnInfoPtr pScrn, ORNum or)
+{
+ G80Ptr pNv = G80PTR(pScrn);
+ const int dacOff = 2048 * or;
+ CARD32 load, tmp;
+
+ pNv->reg[(0x0061A010+dacOff)/4] = 0x00000001;
+ pNv->reg[(0x0061A004+dacOff)/4] = 0x80150000;
+ while(pNv->reg[(0x0061A004+dacOff)/4] & 0x80000000);
+ tmp = pNv->architecture == 0x50 ? 420 : 340;
+ pNv->reg[(0x0061A00C+dacOff)/4] = tmp | 0x100000;
+ usleep(4500);
+ load = pNv->reg[(0x0061A00C+dacOff)/4];
+ pNv->reg[(0x0061A00C+dacOff)/4] = 0;
+ pNv->reg[(0x0061A004+dacOff)/4] = 0x80550000;
+
+ return (load & 0x38000000) == 0x38000000;
+}
+
+/*
* Performs load detection on the DACs. Sets pNv->orType and pNv->or
* accordingly.
*/
@@ -199,21 +221,9 @@ Bool G80LoadDetect(ScrnInfoPtr pScrn)
pNv->orType = DAC;

for(or = DAC0; or <= DAC2; or++) {
- const int dacOff = 2048 * or;
- CARD32 load, tmp;
-
xf86DrvMsg(scrnIndex, X_PROBED, "Trying load detection on DAC%i ... ", or);

- pNv->reg[(0x0061A010+dacOff)/4] = 0x00000001;
- pNv->reg[(0x0061A004+dacOff)/4] = 0x80150000;
- while(pNv->reg[(0x0061A004+dacOff)/4] & 0x80000000);
- tmp = pNv->architecture == 0x50 ? 420 : 340;
- pNv->reg[(0x0061A00C+dacOff)/4] = tmp | 0x100000;
- usleep(4500);
- load = pNv->reg[(0x0061A00C+dacOff)/4];
- pNv->reg[(0x0061A00C+dacOff)/4] = 0;
- pNv->reg[(0x0061A004+dacOff)/4] = 0x80550000;
- if((load & 0x38000000) == 0x38000000) {
+ if(G80DispDetectLoad(pScrn, or)) {
xf86ErrorF("found one!\n");
pNv->or = or;
return TRUE;
diff --git a/src/g80_display.h b/src/g80_display.h
index aec6314..cbe312f 100644
--- a/src/g80_display.h
+++ b/src/g80_display.h
@@ -1,4 +1,5 @@
Bool G80LoadDetect(ScrnInfoPtr);
+Bool G80DispLoadDetect(ScrnInfoPtr, ORNum or);
Bool G80DispInit(ScrnInfoPtr);
Bool G80DispSetMode(ScrnInfoPtr, DisplayModePtr);
void G80DispShutdown(ScrnInfoPtr);
_______________________________________________
xorg-commit mailing list
xorg-commit@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/xorg-commit

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >