X Strike Force XFree86 SVN commit: rev 920 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-01-15 15:01:34 -0500 (Thu, 15 Jan 2004)
New Revision: 920
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/451_ia64_radeon_pagesize.diff
Log:
Fix diff offsets caused by Michel's last commit.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-15 17:48:30 UTC (rev 919)
+++ branches/4.3.0/sid/debian/changelog 2004-01-15 20:01:34 UTC (rev 920)
@@ -76,8 +76,9 @@
* Fix initialisation of some DRI parameters for RV280 chips (and possibly
others with the R200 3D core). (Closes: #225759)
+ [Michel Dänzer]
- debian/patches/030b_radeon_rv280_support.diff
- [Michel Dänzer]
+ - debian/patches/451_ia64_radeon_pagesize.diff: adjust offsets
* Neutralize the workaround for the Linux kernel kbd_rate structure change
after it is no longer needed, so that we don't inadvertently re-#define a
Modified: branches/4.3.0/sid/debian/patches/451_ia64_radeon_pagesize.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/451_ia64_radeon_pagesize.diff 2004-01-15 17:48:30 UTC (rev 919)
+++ branches/4.3.0/sid/debian/patches/451_ia64_radeon_pagesize.diff 2004-01-15 20:01:34 UTC (rev 920)
@@ -14,9 +14,8 @@
XFree86 for now however until I've got time to investigate doing it more
generically.
-diff -ur xc/programs/Xserver/hw/xfree86/drivers/ati.ORIG/r128_dri.c xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati.ORIG/r128_dri.c 2002-10-20 02:48:27.000000000 +0900
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2002-10-20 03:05:24.000000000 +0900
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c~ 2004-01-15 14:58:43.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2004-01-15 14:58:52.000000000 -0500
@@ -54,15 +54,7 @@
#include "GL/glxtokens.h"
#include "sarea.h"
@@ -62,7 +61,7 @@
/* Reserve space for vertex/indirect buffers */
info->bufStart = info->ringReadOffset + info->ringReadMapSize;
-@@ -1003,6 +993,8 @@
+@@ -1003,6 +995,8 @@
break;
}
@@ -71,9 +70,8 @@
/* Create the DRI data structure, and fill it in before calling the
DRIScreenInit(). */
if (!(pDRIInfo = DRICreateInfoRec())) return FALSE;
-diff -ur xc/programs/Xserver/hw/xfree86/drivers/ati.ORIG/radeon_dri.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati.ORIG/radeon_dri.c 2002-10-20 02:48:27.000000000 +0900
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2002-10-20 03:04:18.000000000 +0900
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c~ 2004-01-15 14:58:47.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 2004-01-15 14:58:52.000000000 -0500
@@ -56,15 +56,7 @@
#include "sarea.h"
#include "radeon_sarea.h"
@@ -88,8 +86,8 @@
-# define DRM_PAGE_SIZE 4096
-#endif
+static size_t radeon_drm_page_size;
-
-
+
+
static Bool RADEONDRICloseFullScreen(ScreenPtr pScreen);
@@ -774,11 +766,11 @@
@@ -119,7 +117,7 @@
/* Reserve space for vertex/indirect buffers */
info->bufStart = info->ringReadOffset + info->ringReadMapSize;
-@@ -1218,6 +1210,8 @@
+@@ -1216,6 +1208,8 @@
break;
}
Reply to: