[arch-commits] Commit in xf86-video-intel/repos (9 files)
Jan de Groot
jgc at archlinux.org
Fri Apr 10 19:13:10 UTC 2009
Date: Friday, April 10, 2009 @ 15:13:10
Author: jgc
Revision: 34654
Merged revisions 32224,34645 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-intel/trunk
........
r32224 | jgc | 2009-03-29 16:34:18 +0000 (Sun, 29 Mar 2009) | 2 lines
upgpkg: xf86-video-intel 2.6.99.902-2
Remove old patches, update from 2.7 branch
........
r34645 | jgc | 2009-04-10 18:48:57 +0000 (Fri, 10 Apr 2009) | 1 line
Revert to 2.6.3, add a patch from gentoo. This makes the driver ready for extra
........
Added:
xf86-video-intel/repos/testing-i686/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch
(from rev 34645, xf86-video-intel/trunk/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch)
Modified:
xf86-video-intel/repos/testing-i686/ (properties)
xf86-video-intel/repos/testing-i686/PKGBUILD
Deleted:
xf86-video-intel/repos/testing-i686/20_thinkpad_g40_quirk.patch
xf86-video-intel/repos/testing-i686/21_quirk_lenovo.patch
xf86-video-intel/repos/testing-i686/23_quirks_studiohybrid_eeepc_and_w251u.patch
xf86-video-intel/repos/testing-i686/25_quirk_nc6110.patch
xf86-video-intel/repos/testing-i686/26_i830-use-lfp-data-ptrs.patch
xf86-video-intel/repos/testing-i686/27_disable_fbc_on_965.patch
--------------------------------------------------+
2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch | 27 +++++++++
20_thinkpad_g40_quirk.patch | 18 ------
21_quirk_lenovo.patch | 12 ----
23_quirks_studiohybrid_eeepc_and_w251u.patch | 13 ----
25_quirk_nc6110.patch | 13 ----
26_i830-use-lfp-data-ptrs.patch | 63 ---------------------
27_disable_fbc_on_965.patch | 18 ------
PKGBUILD | 22 +++++--
8 files changed, 42 insertions(+), 144 deletions(-)
Property changes on: xf86-video-intel/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xf86-video-intel/trunk:1-30046
+ /xf86-video-intel/trunk:1-34653
Copied: xf86-video-intel/repos/testing-i686/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch (from rev 34645, xf86-video-intel/trunk/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch)
===================================================================
--- testing-i686/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch (rev 0)
+++ testing-i686/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -0,0 +1,27 @@
+From 2484b1ed2162c5b96173fd1b07ad3421d0dec5c2 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalev at smartlink.ee>
+Date: Fri, 13 Mar 2009 21:32:08 +0200
+Subject: [PATCH 2/2] Fix Xv crash with overlay video.
+
+Bug #20585.
+(cherry picked from commit 2026c57cf0a352d9e6f9d208cfb7d4d550614477)
+---
+ src/i830_video.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/i830_video.c b/src/i830_video.c
+index c9a0181..0698107 100644
+--- a/src/i830_video.c
++++ b/src/i830_video.c
+@@ -1404,7 +1404,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+ dst_base = pPriv->buf->virtual;
+ } else {
+ drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE);
+- dst_base = pI830->FbBase + pPriv->buf->offset;
++ dst_base = pI830->FbBase;
+ }
+
+ if (pPriv->currentBuf == 0)
+--
+1.6.2
+
Deleted: testing-i686/20_thinkpad_g40_quirk.patch
===================================================================
--- testing-i686/20_thinkpad_g40_quirk.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/20_thinkpad_g40_quirk.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,18 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c
---- xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c 2008-06-20 00:05:23.000000000 -0700
-+++ xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c 2008-06-20 00:20:19.000000000 -0700
-@@ -266,9 +266,13 @@ static i830_quirk i830_quirk_list[] = {
- /* HP Compaq 6730s has no TV output */
- { PCI_CHIP_IGD_GM, 0x103c, 0x30e8, quirk_ignore_tv },
-
-+ /* Thinkpad G40 needs pipe A force quirk (See LP: #240457) */
-+ { PCI_CHIP_I855_GM, 0x1014, 0x0543, quirk_pipea_force },
- /* Thinkpad R31 needs pipe A force quirk */
- { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force },
-- /* Dell Latitude D400 needs pipe A force quirk (LP: #228519) */
-+ /* Dell Latitude C400 needs pipe A force quirk (See LP: #216490) */
-+ { PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force },
-+ /* Dell Latitude D400 needs pipe A force quirk (See LP: #228519) */
- { PCI_CHIP_I855_GM, 0x1028, 0x0139, quirk_pipea_force },
- /* Dell Latitude D500 needs pipe A force quirk */
- { PCI_CHIP_I855_GM, 0x1028, 0x0152, quirk_pipea_force },
Deleted: testing-i686/21_quirk_lenovo.patch
===================================================================
--- testing-i686/21_quirk_lenovo.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/21_quirk_lenovo.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,12 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c
---- xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c 2008-06-26 20:21:14.000000000 -0700
-+++ xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c 2008-06-26 20:30:23.000000000 -0700
-@@ -242,6 +242,8 @@ static i830_quirk i830_quirk_list[] = {
-
- /* Lenovo Napa TV (use dmi)*/
- { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },
-+ /* Lenovo T60/R60 needs pipe A force quirk (See LP: #243405) */
-+ { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_pipea_force },
- /* Lenovo T61 has no TV output */
- { PCI_CHIP_I965_GM, 0x17aa, 0x20b5, quirk_ignore_tv },
- /* Lenovo 3000 v200 */
Deleted: testing-i686/23_quirks_studiohybrid_eeepc_and_w251u.patch
===================================================================
--- testing-i686/23_quirks_studiohybrid_eeepc_and_w251u.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/23_quirks_studiohybrid_eeepc_and_w251u.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,13 +0,0 @@
-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
-@@ -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 },
-
-+ /* Quanta Gigabyte W251U (See LP: #244242) */
-+ { PCI_CHIP_I945_GM, 0x152d, 0x0755, quirk_pipea_force },
-+
- /* Ordi Enduro UW31 (See LP: #152416) */
- { PCI_CHIP_I945_GM, 0x1584, 0x9900, quirk_ignore_tv },
-
Deleted: testing-i686/25_quirk_nc6110.patch
===================================================================
--- testing-i686/25_quirk_nc6110.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/25_quirk_nc6110.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,13 +0,0 @@
-diff --git a/src/i830_quirks.c b/src/i830_quirks.c
-index 089e458..09b7c53 100644
---- a/src/i830_quirks.c
-+++ b/src/i830_quirks.c
-@@ -278,6 +278,8 @@ static i830_quirk i830_quirk_list[] = {
- /* Samsung Q45 has no TV output */
- { PCI_CHIP_I965_GM, 0x144d, 0xc510, quirk_ignore_tv },
-
-+ /* HP Compaq nx6110 has no TV output */
-+ { PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv },
- /* HP Compaq 6730s has no TV output */
- { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },
-
Deleted: testing-i686/26_i830-use-lfp-data-ptrs.patch
===================================================================
--- testing-i686/26_i830-use-lfp-data-ptrs.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/26_i830-use-lfp-data-ptrs.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,63 +0,0 @@
-diff -Nurp patched/src/bios_reader/bios_reader.c working/src/bios_reader/bios_reader.c
---- patched/src/bios_reader/bios_reader.c 2008-10-16 14:06:07.000000000 -0700
-+++ working/src/bios_reader/bios_reader.c 2008-10-16 14:25:07.000000000 -0700
-@@ -180,6 +180,19 @@ static void dump_lvds_options(void *data
- printf("\tPFIT mode: %d\n", options->pfit_mode);
- }
-
-+static void dump_lvds_ptr_data(void *data, unsigned char *base)
-+{
-+ struct bdb_lvds_lfp_data_ptrs *ptrs = data;
-+
-+ struct lvds_fp_timing *fp_timing =
-+ (struct lvds_fp_timing *)(base + ptrs->ptr[panel_type].fp_timing_offset);
-+
-+ printf("LVDS timing pointer data:\n");
-+
-+ printf("\tpanel type %02i: %dx%d\n", panel_type, fp_timing->x_res,
-+ fp_timing->y_res);
-+}
-+
- static void dump_lvds_data(void *data, unsigned char *base)
- {
- struct bdb_lvds_lfp_data *lvds_data = data;
-@@ -274,6 +287,8 @@ int main(int argc, char **argv)
- dump_general_definitions(find_section(bdb, BDB_GENERAL_DEFINITIONS));
- dump_lvds_options(find_section(bdb, BDB_LVDS_OPTIONS));
- dump_lvds_data(find_section(bdb, BDB_LVDS_LFP_DATA), bdb);
-+ dump_lvds_ptr_data(find_section(bdb, BDB_LVDS_LFP_DATA_PTRS),
-+ (unsigned char *)bdb);
-
- return 0;
- }
-diff -Nurp patched/src/i830_bios.c working/src/i830_bios.c
---- patched/src/i830_bios.c 2008-10-16 14:06:07.000000000 -0700
-+++ working/src/i830_bios.c 2008-10-16 14:27:15.000000000 -0700
-@@ -89,7 +89,8 @@ parse_panel_data(I830Ptr pI830, struct b
- {
- struct bdb_lvds_options *lvds_options;
- struct bdb_lvds_lfp_data *lvds_lfp_data;
-- struct bdb_lvds_lfp_data_entry *entry;
-+ struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
-+ int timing_offset;
- DisplayModePtr fixed_mode;
- unsigned char *timing_ptr;
-
-@@ -104,12 +105,13 @@ parse_panel_data(I830Ptr pI830, struct b
- if (lvds_options->panel_type == 0xff)
- return;
-
-- lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);
-- if (!lvds_lfp_data)
-+ lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
-+ if (!lvds_lfp_data_ptrs)
- return;
-
-- entry = &lvds_lfp_data->data[lvds_options->panel_type];
-- timing_ptr = (unsigned char *)&entry->dvo_timing;
-+ timing_offset =
-+ lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
-+ timing_ptr = (unsigned char *)bdb + timing_offset;
-
- fixed_mode = xnfalloc(sizeof(DisplayModeRec));
- memset(fixed_mode, 0, sizeof(*fixed_mode));
Deleted: testing-i686/27_disable_fbc_on_965.patch
===================================================================
--- testing-i686/27_disable_fbc_on_965.patch 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/27_disable_fbc_on_965.patch 2009-04-10 19:13:10 UTC (rev 34654)
@@ -1,18 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 5b78236..89f19d2 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -950,6 +950,13 @@ static inline int i830_fb_compression_supported(I830Ptr pI830)
- */
- if (!pI830->tiling || (IS_I965G(pI830) && pI830->accel <= ACCEL_XAA))
- return FALSE;
-+ /* We have not gotten FBC to work consistently on 965GM. Our best
-+ * working theory right now is that FBC simply isn't reliable on
-+ * that device. See this bug report for more details:
-+ * https://bugs.freedesktop.org/show_bug.cgi?id=16257
-+ */
-+ if (IS_I965GM(pI830))
-+ return FALSE;
- return TRUE;
- }
-
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-04-10 19:11:07 UTC (rev 34653)
+++ testing-i686/PKGBUILD 2009-04-10 19:13:10 UTC (rev 34654)
@@ -2,22 +2,30 @@
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.6.99.902
-pkgrel=1
+pkgver=2.6.3
+pkgrel=3
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
-depends=('intel-dri>=7.3' 'libpciaccess>=0.10.5' 'libdrm>=2.4.5' 'libxvmc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.3')
+depends=('intel-dri>=7.4' 'libpciaccess>=0.10.5' 'libdrm>=2.4.6' 'libxvmc')
+makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.4')
conflicts=('xorg-server<1.6.0' 'xf86-video-i810')
-replaces=('xf86-video-i810')
options=('!libtool' 'force')
groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b1869be6032c00654f562bd5d6ac9701')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ vt-switch-leak-1.patch
+ vt-switch-leak-2.patch
+ 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch)
+md5sums=('440c014bbd3072b5d379fe1bdb861918'
+ 'e468cfc5aabfe0ff0fcda7eb3243c343'
+ '2db78fef97610bd50b124baeea3027d7'
+ '1bcedcd65e9bc3c87a6d26d7c97d1692')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/vt-switch-leak-1.patch" || return 1
+ patch -Np1 -i "${srcdir}/vt-switch-leak-2.patch" || return 1
+ patch -Np1 -i "${srcdir}/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch" || return 1
./configure --prefix=/usr --enable-dri || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
More information about the arch-commits
mailing list