Hello community, here is the log from the commit of package xf86-video-nv for openSUSE:Factory checked in at 2013-12-11 17:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-nv (Old) and /work/SRC/openSUSE:Factory/.xf86-video-nv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-nv" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-nv/xf86-video-nv.changes 2013-08-23 11:09:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-nv.new/xf86-video-nv.changes 2013-12-11 17:45:18.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 2 15:21:46 UTC 2013 - sndir...@suse.com + +- U_Include-xf86Modes.h-to-use-functions-from-hw-xfree86.patch + * Include xf86Modes.h to use functions from + hw/xfree86/modes/xf86Modes.c. +- U_init-Initialize-VGA-IOBase-before-using-it.patch + * init: Initialize VGA IOBase before using it; The NV driver did + never set the VGA IOBase for those registers which have + different addresses dependent whether the VGA engine is running + in mono or color mode. This has not been detected as the VGA + mode and font save/restore functions initialize this value + themselves. + +------------------------------------------------------------------- New: ---- U_Include-xf86Modes.h-to-use-functions-from-hw-xfree86.patch U_init-Initialize-VGA-IOBase-before-using-it.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-nv.spec ++++++ --- /var/tmp/diff_new_pack.Ktr0J0/_old 2013-12-11 17:45:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Ktr0J0/_new 2013-12-11 17:45:19.000000000 +0100 @@ -26,6 +26,8 @@ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch0: xf86-video-nv-bug519261-increase-virtual.diff Patch1: U_Remove-mibstore.h.patch +Patch2: U_Include-xf86Modes.h-to-use-functions-from-hw-xfree86.patch +Patch3: U_init-Initialize-VGA-IOBase-before-using-it.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -62,6 +64,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi ++++++ U_Include-xf86Modes.h-to-use-functions-from-hw-xfree86.patch ++++++ >From 49ee1c26ea982e302169c949ebd0abb9d8ef362c Mon Sep 17 00:00:00 2001 From: Jeremy White <jwh...@codeweavers.com> Date: Thu, 21 Mar 2013 08:59:06 -0700 Subject: [PATCH 1/2] Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c. Signed-off-by: Jeremy White <jwh...@codeweavers.com> Reviewed-by: Robert Morell <rmor...@nvidia.com> Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> --- src/nv_include.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nv_include.h b/src/nv_include.h index f174eef..72c74d5 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -27,6 +27,7 @@ #include "micmap.h" #include "xf86DDC.h" +#include "xf86Modes.h" #include "vbe.h" -- 1.8.1.4 ++++++ U_init-Initialize-VGA-IOBase-before-using-it.patch ++++++ >From 0b6619fec39fada995646fb95bb25e72d3c9a491 Mon Sep 17 00:00:00 2001 From: Egbert Eich <e...@freedesktop.org> Date: Tue, 13 Aug 2013 20:36:59 +0200 Subject: [PATCH 2/2] init: Initialize VGA IOBase before using it The NV driver did never set the VGA IOBase for those registers which have different addresses dependent whether the VGA engine is running in mono or color mode. This has not been detected as the VGA mode and font save/restore functions initialize this value themselves. Signed-off-by: Egbert Eich <e...@freedesktop.org> Reviewed-by: Mark Kettenis <kette...@openbsd.org> --- src/nv_setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nv_setup.c b/src/nv_setup.c index 203e7b2..92ca3ec 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -491,6 +491,8 @@ NVCommonSetup(ScrnInfoPtr pScrn) pNv->Television = FALSE; + vgaHWGetIOBase(pVga); + if(!pNv->twoHeads) { pNv->CRTCnumber = 0; if((monitorA = NVProbeDDC(pScrn, 0))) { -- 1.8.1.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org