Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit xorg-x11-driver-video
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 16 Mar 2007 10:13:15 +0100
  • Message-id: <20070316091315.409F9678178@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xorg-x11-driver-video
checked in at Fri Mar 16 10:13:15 CET 2007.

--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-14 23:04:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-15 22:50:29.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 15 22:49:38 CET 2007 - sndirsch@xxxxxxx
+
+- xf86-video-nv-vesafb-vga.diff:
+ * Fix VGA output with vesafb on nv4x and G7x GPUs (Bug #160812)
+
+-------------------------------------------------------------------

New:
----
xf86-video-nv-vesafb-vga.diff

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

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.t13461/_old 2007-03-16 10:13:07.000000000 +0100
+++ /var/tmp/diff_new_pack.t13461/_new 2007-03-16 10:13:07.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: 64
+Release: 65
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -76,6 +76,7 @@
Patch3: ps_nv.diff
Patch4: xf86-video-nv-DAC.diff
Patch5: mga-g200se_pci-fix.diff
+Patch6: xf86-video-nv-vesafb-vga.diff
Patch9: xf86-video-sunffb.diff
Patch10: xf86-video-tdfx.diff
Patch11: xf86-video-glint.diff
@@ -117,7 +118,10 @@
popd
pushd xf86-video-nv-*/src
%patch3 -p6
-%patch4 -p2
+popd
+pushd xf86-video-nv-*
+%patch4 -p1
+%patch6 -p1
popd
pushd xf86-video-mga-*/src
tar xzf %{SOURCE44}
@@ -254,6 +258,9 @@
%{_mandir}/man4/*

%changelog
+* Thu Mar 15 2007 - sndirsch@xxxxxxx
+- xf86-video-nv-vesafb-vga.diff:
+ * Fix VGA output with vesafb on nv4x and G7x GPUs (Bug #160812)
* Wed Mar 14 2007 - sndirsch@xxxxxxx
- intel driver release 1.9.92 (2.0 RC2):
* Major changes in this release include moving more code to the

++++++ xf86-video-nv-vesafb-vga.diff ++++++
man/Makefile.am | 4 ++--
src/nv_hw.c | 12 ++++++++++++
src/nv_type.h | 1 +
3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
diff-tree 9d65abab153cdf3ab2b7e3e2843d573b22ea6769 (from 26a9f1fa5a92eba7d4b6ddfa47c0517e604be130)
Author: Aaron Plattner <aplattner@xxxxxxxxxx>
Date: Wed Mar 14 21:16:04 2007 -0700

Fix VGA output with vesafb on nv4x and G7x GPUs.

SuSE bug #160812.

diff --git a/src/nv_hw.c b/src/nv_hw.c
index ab703f1..6232cd6 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -878,6 +878,10 @@ void NVCalcStateExt (
state->general = bpp == 16 ? 0x00101100 : 0x00100100;
state->repaint1 = hDisplaySize < 1280 ? 0x04 : 0x00;
break;
+ case NV_ARCH_40:
+ if(!pNv->FlatPanel)
+ state->control = pNv->PRAMDAC0[0x0580/4] & 0xeffffeff;
+ /* fallthrough */
case NV_ARCH_10:
case NV_ARCH_20:
case NV_ARCH_30:
@@ -1475,6 +1479,10 @@ void NVLoadStateExt (
VGA_WR08(pNv->PCIO, 0x03D5, state->interlace);

if(!pNv->FlatPanel) {
+ if(pNv->Architecture >= NV_ARCH_40) {
+ pNv->PRAMDAC0[0x0580/4] = state->control;
+ }
+
pNv->PRAMDAC0[0x050C/4] = state->pllsel;
pNv->PRAMDAC0[0x0508/4] = state->vpll;
if(pNv->twoHeads)
@@ -1541,6 +1549,10 @@ void NVUnloadStateExt
state->scale = pNv->PRAMDAC[0x0848/4];
state->config = pNv->PFB[0x0200/4];

+ if(pNv->Architecture >= NV_ARCH_40 && !pNv->FlatPanel) {
+ state->control = pNv->PRAMDAC0[0x0580/4];
+ }
+
if(pNv->Architecture >= NV_ARCH_10) {
if(pNv->twoHeads) {
state->head = pNv->PCRTC0[0x0860/4];
diff --git a/src/nv_type.h b/src/nv_type.h
index d704e2e..6b29d99 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -56,6 +56,7 @@ typedef struct _riva_hw_state
U032 vpllB;
U032 vpll2B;
U032 pllsel;
+ U032 control;
U032 general;
U032 crtcOwner;
U032 head;
diff-tree 26a9f1fa5a92eba7d4b6ddfa47c0517e604be130 (from 8b2c7bc457d34b7ed59cd08719bec8754ebf6fb8)
Author: Aaron Plattner <aplattner@xxxxxxxxxx>
Date: Mon Mar 12 14:56:10 2007 -0700

Get rid of non-portable := assignments.

diff --git a/man/Makefile.am b/man/Makefile.am
index 036545c..442d27d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -42,9 +42,9 @@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11

if SUPPORT_G80
-MAN_SUPPORT_G80 := 1
+MAN_SUPPORT_G80 = 1
else
-MAN_SUPPORT_G80 := 0
+MAN_SUPPORT_G80 = 0
endif

MAN_SUBSTS = \
_______________________________________________
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 >