ports/xorg
3
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.4' into 2.5

Browse Source
This commit is contained in:
Tilman Sauerbeck 2008-10-21 18:24:22 +02:00
commit bb92b5b667
9 changed files with 10 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorg-libpciaccess/.md5sum
View File

@ -1 +1 @@
6d5468debf76fac84576ca26c9535821 libpciaccess-0.10.3.tar.bz2
fa9744c556c4c05e52b9b9716092c733 libpciaccess-0.10.4.tar.bz2

2
xorg-libpciaccess/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
name=xorg-libpciaccess
version=0.10.3
version=0.10.4
release=1
source=(http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$version.tar.bz2)

2
xorg-xf86-input-elographics/.md5sum
View File

@ -1 +1 @@
50a9c32af12ca4733afe23042f012f9c xf86-input-elographics-1.2.2.tar.bz2
cc2923460c8eff9652b01889a063058d xf86-input-elographics-1.2.3.tar.bz2

2
xorg-xf86-input-elographics/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
name=xorg-xf86-input-elographics
version=1.2.2
version=1.2.3
release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-$version.tar.bz2)

2
xorg-xf86-input-vmmouse/.md5sum
View File

@ -1 +1 @@
1e2feafb8e4f1b670aeb39bcac9fbb18 xf86-input-vmmouse-12.5.1.tar.bz2
3b442c622be1ad030c092fadbfd222a5 xf86-input-vmmouse-12.5.2.tar.bz2

2
xorg-xf86-input-vmmouse/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: xorg-server
name=xorg-xf86-input-vmmouse
version=12.5.1
version=12.5.2
release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-$version.tar.bz2)

3
xorg-xf86-video-intel/.md5sum
View File

@ -1,2 +1 @@
f545ae01c69b96bfefc150ecd2c558a9 intel-disable-render-standy.patch
5cd6b3ed57c7e78ab51e9d9266e73fb6 xf86-video-intel-2.4.2.tar.bz2
462f205bd47766265246cc39801b75e7 xf86-video-intel-2.5.0.tar.bz2

8
xorg-xf86-video-intel/Pkgfile
View File

@ -3,14 +3,12 @@
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
name=xorg-xf86-video-intel
version=2.4.2
release=2
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2 \
intel-disable-render-standy.patch)
version=2.5.0
release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2)
build() {
cd xf86-video-intel-$version
patch -p1 -i $SRC/intel-disable-render-standy.patch
./configure --prefix=/usr --mandir=/usr/man

64
xorg-xf86-video-intel/intel-disable-render-standy.patch
View File

@ -1,64 +0,0 @@
From 86f82c429f5d7067c52d3b783988917869e13d1d Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu, 11 Sep 2008 15:49:41 +0800
Subject: [PATCH] Disable render standby
Render standby is known to cause possible hang issue on some
mobile chips, so always disable it.
---
src/i810_reg.h | 3 +++
src/i830_driver.c | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git xf86-video-intel-2.4.2/src/i810_reg.h xf86-video-intel-2.4.2/src/i810_reg.h
index 8690954..af8c6a3 100644
--- xf86-video-intel-2.4.2/src/i810_reg.h
+++ xf86-video-intel-2.4.2/src/i810_reg.h
@@ -2815,4 +2815,7 @@ typedef enum {
#define PEG_BAND_GAP_DATA 0x14d68
+#define MCHBAR_RENDER_STANDBY 0x111B8
+#define RENDER_STANDBY_ENABLE (1 << 30)
+
#endif /* _I810_REG_H */
diff --git xf86-video-intel-2.4.2/src/i830_driver.c xf86-video-intel-2.4.2/src/i830_driver.c
index 6f87c51..209aa07 100644
--- xf86-video-intel-2.4.2/src/i830_driver.c
+++ xf86-video-intel-2.4.2/src/i830_driver.c
@@ -2718,6 +2718,23 @@ i830_memory_init(ScrnInfoPtr pScrn)
return FALSE;
}
+static void
+i830_disable_render_standby(ScrnInfoPtr pScrn)
+{
+ I830Ptr pI830 = I830PTR(pScrn);
+ uint32_t render_standby;
+
+ /* Render Standby might cause hang issue, try always disable it.*/
+ if (IS_I965GM(pI830) || IS_GM45(pI830)) {
+ render_standby = INREG(MCHBAR_RENDER_STANDBY);
+ if (render_standby & RENDER_STANDBY_ENABLE) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disable render standby.\n");
+ OUTREG(MCHBAR_RENDER_STANDBY,
+ (render_standby & (~RENDER_STANDBY_ENABLE)));
+ }
+ }
+}
+
static Bool
I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{
@@ -3053,6 +3070,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!vgaHWMapMem(pScrn))
return FALSE;
+ i830_disable_render_standby(pScrn);
+
DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
if (!pI830->useEXA) {
--
1.6.0.1