summaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server/files/patch-r128_dri.c
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2005-01-13 22:52:24 +0000
committerEric Anholt <anholt@FreeBSD.org>2005-01-13 22:52:24 +0000
commit31179eebc6675c7d631952e4d10aaeb89f142f00 (patch)
tree757be619fcbf67d31d680bb3b524073b33d427eb /x11-servers/xorg-server/files/patch-r128_dri.c
parent- Update to 3.2.4 (diff)
[1] Add i810 driver to AMD64 package.
[2] Put the manpages from section 4 under 4x. For example, you can do "man 4x vga" to get the X vga(4x) manpage, still do man 4 cirrus to get cirrus(4x), and man -a vga to get both vga manpages. [3] Apply several important-looking fixes to ATI drivers from the stable branch: - Fix mode setting with Mach64 on some laptops. - Don't crash with mach64 for some PCI configurations - Improve hang detection on r128s. (may improve speed in DRI, too) - Avoid a hang on server regen on r128 with DRI. - Fix the DynamicClocks support, which could have caused hangs with DRI on original Radeons. PR: [2] ports/25576 Submitted by: [2] fanf Requested by: [1] peter Obtained from: [3] XORG-6_8-branch
Notes
Notes: svn path=/head/; revision=126370
Diffstat (limited to 'x11-servers/xorg-server/files/patch-r128_dri.c')
-rw-r--r--x11-servers/xorg-server/files/patch-r128_dri.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/files/patch-r128_dri.c b/x11-servers/xorg-server/files/patch-r128_dri.c
new file mode 100644
index 000000000000..c31694837bcc
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-r128_dri.c
@@ -0,0 +1,16 @@
+Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v
+retrieving revision 1.4
+retrieving revision 1.4.4.1
+diff -u -u -r1.4 -r1.4.4.1
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 10 Jul 2004 14:22:35 -0000 1.4
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 15 Dec 2004 08:53:01 -0000 1.4.4.1
+@@ -1297,6 +1297,7 @@
+ if (info->irq) {
+ drmCtlUninstHandler(info->drmFD);
+ info->irq = 0;
++ info->gen_int_cntl = 0;
+ }
+
+ /* De-allocate vertex buffers */