[arch-commits] Commit in xf86-video-intel/repos (5 files)

Jan de Groot jgc at archlinux.org
Sun Nov 30 16:46:02 UTC 2008


    Date: Sunday, November 30, 2008 @ 11:46:02
  Author: jgc
Revision: 20120

Merged revisions 19082 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-intel/trunk

........
  r19082 | jgc | 2008-11-14 21:08:36 +0000 (Fri, 14 Nov 2008) | 1 line
  
  upgpkg: xf86-video-intel 2.4.3-1
........

Modified:
  xf86-video-intel/repos/extra-x86_64/	(properties)
  xf86-video-intel/repos/extra-x86_64/23_quirks_studiohybrid_eeepc_and_w251u.patch
  xf86-video-intel/repos/extra-x86_64/PKGBUILD
Deleted:
  xf86-video-intel/repos/extra-x86_64/22_no_pipe_for_hotplug_detection.patch
  xf86-video-intel/repos/extra-x86_64/28_stolen_memory_counting_g4x.patch

----------------------------------------------+
 22_no_pipe_for_hotplug_detection.patch       |   60 -------------------------
 23_quirks_studiohybrid_eeepc_and_w251u.patch |   21 --------
 28_stolen_memory_counting_g4x.patch          |   35 --------------
 PKGBUILD                                     |   18 ++++---
 4 files changed, 10 insertions(+), 124 deletions(-)


Property changes on: xf86-video-intel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-intel/trunk:1-18522
   + /xf86-video-intel/trunk:1-20119
Deleted: svn:mergeinfo
   - 

Deleted: extra-x86_64/22_no_pipe_for_hotplug_detection.patch
===================================================================
--- extra-x86_64/22_no_pipe_for_hotplug_detection.patch	2008-11-30 16:43:20 UTC (rev 20119)
+++ extra-x86_64/22_no_pipe_for_hotplug_detection.patch	2008-11-30 16:46:02 UTC (rev 20120)
@@ -1,60 +0,0 @@
-From: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date: Wed, 20 Aug 2008 21:40:29 +0000 (-0700)
-Subject: Don't allocate a pipe for hotplug detection
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=7b6f4d22211d71480caf6335a3eacaacff369371
-
-Don't allocate a pipe for hotplug detection
-
-It shouldn't be needed...
----
-
---- a/src/i830_crt.c
-+++ b/src/i830_crt.c
-@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output)
-     xf86OutputStatus	    status;
-     Bool		    connected;
- 
--    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
--    if (!crtc)
--	return XF86OutputStatusUnknown;
--
-+    /*
-+     * Try hotplug detection where supported
-+     */
-     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
- 	    IS_G33CLASS(pI830)) {
- 	if (i830_crt_detect_hotplug(output))
-@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output)
- 	else
- 	    status = XF86OutputStatusDisconnected;
- 
--	goto out;
-+	goto done;
-     }
- 
-+    /*
-+     * DDC is next best, no flicker
-+     */
-+    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
-+    if (!crtc)
-+	return XF86OutputStatusUnknown;
-+
-     if (i830_crt_detect_ddc(output)) {
- 	status = XF86OutputStatusConnected;
--	goto out;
-+	goto out_release_pipe;
-     }
- 
-     /* Use the load-detect method if we have no other way of telling. */
-@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output)
-     else
- 	status = XF86OutputStatusDisconnected;
- 
--out:
-+out_release_pipe:
-     i830ReleaseLoadDetectPipe (output, dpms_mode);
- 
-+done:
-     return status;
- }
- 

Modified: extra-x86_64/23_quirks_studiohybrid_eeepc_and_w251u.patch
===================================================================
--- extra-x86_64/23_quirks_studiohybrid_eeepc_and_w251u.patch	2008-11-30 16:43:20 UTC (rev 20119)
+++ extra-x86_64/23_quirks_studiohybrid_eeepc_and_w251u.patch	2008-11-30 16:46:02 UTC (rev 20120)
@@ -1,27 +1,6 @@
 diff -Nurp xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c
 --- xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c	2008-09-08 20:12:28.000000000 -0700
 +++ xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c	2008-09-08 21:02:53.000000000 -0700
-@@ -223,7 +223,10 @@ static i830_quirk i830_quirk_list[] = {
-     /* Apple Mac mini has no lvds, but macbook pro does */
-     { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
- 
--    /* Transtec Senyo 610 mini pc */
-+    /* Asus Eee PC B202 (See LP: #233787) */
-+    { PCI_CHIP_I945_GME, 0x1043, 0x1252, quirk_ignore_lvds },
-+
-+    /* Transtec Senyo 610 mini pc (See LP: #233787) */
-     { PCI_CHIP_I965_GM, 0x1509, 0x2f15, quirk_ignore_lvds },
- 
-     /* Clevo M720R has no tv output */
-@@ -243,6 +246,8 @@ static i830_quirk i830_quirk_list[] = {
-     { PCI_CHIP_I965_GM, 0x1028, 0x0286, quirk_ignore_tv },
-     /* Dell Vostro A840 (LP: #235155) */
-     { PCI_CHIP_I965_GM, 0x1028, 0x0298, quirk_ignore_tv },
-+    /* Dell Studio Hybrid (LP: #267945) */
-+    { PCI_CHIP_I965_GM, 0x1028, 0x0279, quirk_ignore_lvds },
- 
-     /* Lenovo Napa TV (use dmi)*/
-     { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },
 @@ -312,6 +317,9 @@ static i830_quirk i830_quirk_list[] = {
      /* Sony vaio VGN-SZ4MN (See LP: #212163) */
      { PCI_CHIP_I830_M, 0x104d, 0x81e6, quirk_pipea_force },

Deleted: extra-x86_64/28_stolen_memory_counting_g4x.patch
===================================================================
--- extra-x86_64/28_stolen_memory_counting_g4x.patch	2008-11-30 16:43:20 UTC (rev 20119)
+++ extra-x86_64/28_stolen_memory_counting_g4x.patch	2008-11-30 16:46:02 UTC (rev 20120)
@@ -1,35 +0,0 @@
-From: Eric Anholt <eric at anholt.net>
-Date: Tue, 14 Oct 2008 18:33:33 +0000 (-0700)
-Subject: Fix broken stolen memory counting on G4X.
-X-Git-Tag: xserver-xorg-video-intel-2_2.3.2-2+lenny5~5
-X-Git-Url: http://git.debian.org/?p=pkg-xorg%2Fdriver%2Fxserver-xorg-video-intel.git;a=commitdiff_plain;h=8971411781c5bd0b9e9d4c2c776ba6e21c313f00
-
-Fix broken stolen memory counting on G4X.
-
-On the GM45 we were assuming too little stolen memory (mostly harmless,
-except when it wasn't, until the AGP fix), and on the G45 we were assuming too
-much stolen memory, which was quite harmful when we touched the page that
-didn't get mapped.
-
-Future stolen memory accounting should use src/reg_dumper/intel_gtt before and
-after enabling AGP on the chipset to confirm that only the GTT entries not
-mapped to stolen are replaced, and that all of the unmapped GTT entries are
-replaced with the constant scratch page.
-(cherry picked from commit 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4)
----
-
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 5269871..a9f4478 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -520,8 +520,8 @@ I830DetectMemory(ScrnInfoPtr pScrn)
-    range = gtt_size + 4;
- 
-    /* new 4 series hardware has seperate GTT stolen with GFX stolen */
--   if (IS_G4X(pI830))
--       range = 0;
-+   if (IS_G4X(pI830) || IS_GM45(pI830))
-+       range = 4;
- 
-    if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
-       switch (gmch_ctrl & I855_GMCH_GMS_MASK) {

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-30 16:43:20 UTC (rev 20119)
+++ extra-x86_64/PKGBUILD	2008-11-30 16:46:02 UTC (rev 20120)
@@ -2,8 +2,8 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-intel
-pkgver=2.4.2
-pkgrel=2
+pkgver=2.4.3
+pkgrel=1
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -16,24 +16,26 @@
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 	20_thinkpad_g40_quirk.patch
 	21_quirk_lenovo.patch
-	22_no_pipe_for_hotplug_detection.patch
 	23_quirks_studiohybrid_eeepc_and_w251u.patch
 	25_quirk_nc6110.patch
 	26_i830-use-lfp-data-ptrs.patch
-	27_disable_fbc_on_965.patch
-	28_stolen_memory_counting_g4x.patch)
-md5sums=('462f205bd47766265246cc39801b75e7')
+	27_disable_fbc_on_965.patch)
+md5sums=('a664819288b98a37f77ab6ae1e14c9d9'
+         '68a362a168ffa4f37d9f722f43855468'
+         '2d617364ac2e47ca366901d0b849b1a1'
+         '3d0f8e593e8eac3000154feb6b0f45b8'
+         '3deb800906e6845e8576d4e9d0f22b12'
+         'cb7ee7a68858c038020e0cd991143d8e'
+         'd215e428585c6e55aefd9f525ebfbe7b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/20_thinkpad_g40_quirk.patch" || return 1
   patch -Np1 -i "${srcdir}/21_quirk_lenovo.patch" || return 1
-  patch -Np1 -i "${srcdir}/22_no_pipe_for_hotplug_detection.patch" || return 1
   patch -Np1 -i "${srcdir}/23_quirks_studiohybrid_eeepc_and_w251u.patch" || return 1
   patch -Np1 -i "${srcdir}/25_quirk_nc6110.patch" || return 1
   patch -Np1 -i "${srcdir}/26_i830-use-lfp-data-ptrs.patch" || return 1
   patch -Np1 -i "${srcdir}/27_disable_fbc_on_965.patch" || return 1
-  patch -Np1 -i "${srcdir}/28_stolen_memory_counting_g4x.patch" || return 1
   ./configure --prefix=/usr \
               --enable-dri || return 1
   make || return 1




More information about the arch-commits mailing list