Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Wed Mar 19 13:15:53 CET 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-12 20:39:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-17 23:56:16.941356000 +0100
@@ -1,0 +2,7 @@
+Tue Mar 18 00:12:31 CET 2008 - sndirsch@suse.de
+
+- xf86-video-savage-xvideofix.diff
+ * cherry picked 6 upstream commits on top of the driver release
+ 2.1.3 to fix Xvideo freeze (bnc #370018, Luc Verhaegen)
+
+-------------------------------------------------------------------
New:
----
xf86-video-savage-xvideofix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.J19921/_old 2008-03-19 13:14:54.000000000 +0100
+++ /var/tmp/diff_new_pack.J19921/_new 2008-03-19 13:14:54.000000000 +0100
@@ -15,7 +15,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 91
+Release: 93
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -93,6 +93,7 @@
Patch47: xf86-video-vmware-10.15.2.diff
Patch48: xf86-video-sisusb.diff
Patch50: xf86-video-intel-git.diff
+Patch51: xf86-video-savage-xvideofix.diff
Patch100: xf86-video-ati-6.6.3-r128-xvideo.patch
Patch101: xf86-video-ati-6.6.3-compile-cfb.patch
Patch102: xf86-video-ati-6.6.3-if0.patch
@@ -189,6 +190,9 @@
pushd xf86-video-sisusb-*
%patch48
popd
+pushd xf86-video-savage-*
+%patch51 -p1
+popd
%build
for dir in xf86-video-nv-* \
@@ -257,6 +261,10 @@
%{_mandir}/man4/*
%changelog
+* Tue Mar 18 2008 sndirsch@suse.de
+- xf86-video-savage-xvideofix.diff
+ * cherry picked 6 upstream commits on top of the driver release
+ 2.1.3 to fix Xvideo freeze (bnc #370018, Luc Verhaegen)
* Wed Mar 12 2008 sndirsch@suse.de
- require xorg-x11-driver-video-radeonhd
* Fri Mar 07 2008 sndirsch@suse.de
++++++ xf86-video-savage-xvideofix.diff ++++++
This patch combines the following upstream commits:
312b0d76b9bca879c9eaf099647f74f282d103fc by Alex Deucher.
1f0cd194a26be1d07188e693016bc3efa3d85754 by Alex Villacís Lasso.
54235740089f8e661c2d6c95171653182a680162 by Alex Villacís Lasso.
55e6dba37d3462541739dda34e02007ed4ef38a0 by Alex Villacís Lasso.
de82a21a906a21b82b231dcdba2cb6bb4e1cbc31 by Alex Villacís Lasso.
3e396a10bbad1bcf63a33f04e09f6edb4d41ee65 by Alex Villacís Lasso.
Cherry picked on top of tag xf86-video-savage-2.1.3.
Fixes at least novell bug #370018
diff --git a/src/savage_driver.c b/src/savage_driver.c
index c56edf1..e214ea5 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -111,7 +111,7 @@ static Bool SavageDDC1(int scrnIndex);
static unsigned int SavageDDC1Read(ScrnInfoPtr pScrn);
static void SavageProbeDDC(ScrnInfoPtr pScrn, int index);
static void SavageGetTvMaxSize(SavagePtr psav);
-static Bool SavagePanningCheck(ScrnInfoPtr pScrn);
+static Bool SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode);
#ifdef XF86DRI
static Bool SavageCheckAvailableRamFor3D(ScrnInfoPtr pScrn);
#endif
@@ -3413,7 +3413,7 @@ static Bool SavageScreenInit(int scrnInd
}
#endif
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, pScrn->currentMode);
#ifdef XvExtension
if( !psav->FBStart2nd && !psav->NoAccel /*&& !SavagePanningCheck(pScrn)*/ ) {
if (psav->IsSecondary)
@@ -4057,7 +4057,7 @@ Bool SavageSwitchMode(int scrnIndex, Dis
pSavEnt = pPriv->ptr;
SavageModeInit(pSavEnt->pSecondaryScrn, pSavEnt->pSecondaryScrn->currentMode);
}
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, mode);
return success;
}
@@ -4536,12 +4536,9 @@ SavageGetTvMaxSize(SavagePtr psav)
static Bool
-SavagePanningCheck(ScrnInfoPtr pScrn)
+SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode)
{
SavagePtr psav = SAVPTR(pScrn);
- DisplayModePtr pMode;
-
- pMode = pScrn->currentMode;
psav->iResX = pMode->CrtcHDisplay;
psav->iResY = pMode->CrtcVDisplay;
diff --git a/src/savage_video.c b/src/savage_video.c
index 64dcef1..cdea1fd 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1177,7 +1177,7 @@ SavageCopyPlanarDataBCI(
SavagePtr psav = SAVPTR(pScrn);
/* half of the dest buffer for copying the YVU data to it ??? */
unsigned char *dstCopy = (unsigned char *)(((unsigned long)dst
- + 2 * srcPitch * h
+ + dstPitch * h
+ 0x0f) & ~0x0f);
/* for pixel transfer */
unsigned long offsetY = (unsigned long)dstCopy - (unsigned long)psav->FBBase;
@@ -1189,21 +1189,15 @@ SavageCopyPlanarDataBCI(
BCI_GET_PTR;
/* copy Y planar */
- for (i=0;i