Add patch to fix SNA crash with newer libdrm/kernel, bug #552124.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

4 files changed, 163 insertions, 16 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 89ea4a685723..890d3ef63264 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.169 2015/06/13 22:53:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.170 2015/06/15 12:26:19 chithanh Exp $
+
+*xf86-video-intel-2.99.917-r2 (15 Jun 2015)
+
+  15 Jun 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch,
+  +xf86-video-intel-2.99.917-r2.ebuild:
+  Add patch to fix SNA crash with newer libdrm/kernel, bug #552124.
 
 *xf86-video-intel-2.99.917-r1 (13 Jun 2015)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 4409a9309919..5eb7aee8df88 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -7,6 +7,7 @@ AUX xf86-video-intel-2.99.906-server-crash.patch 1373 SHA256 4999e15222ae1ed6770
 AUX xf86-video-intel-2.99.907-invalidation.patch 1707 SHA256 feb57fb5acbf18dec6d72e3990db318adecf07e44f7c7e03bdfaa488f6d40b66 SHA512 7ecbeb4574ad089f58aeeb84280bfca9f48754312a6d4f68d7f32c71e29de7582556806d5f399c555751edc9b70be5780a26ed2d2187fcfeba3fef4ed1f71229 WHIRLPOOL 093ac0b591c8c781b72325fe3762de475f3e97aaa54dbaaa207bcc55c0e66dca9e5e1ccf064cef1a847c98621438e8d633187ea4480c7ef76d05de853fcc6752
 AUX xf86-video-intel-2.99.911-sna-pixmap-migration.patch 3801 SHA256 c0758266c9eceb7647316639b4408c02e6beac86eef8871c5ff756c188488276 SHA512 b5d7ca5cd93d3ed4bba150b312fc868e53867a04df94956b367caf315e32398ea8558ee0059debd7e7684794fb2e55361d0ae425ccc66187d22297003894e76b WHIRLPOOL bc273ef3add88f9ddee4cbc9f23434edf0a91e5a6157691496c907dff2391dd8ce38ed98ca382c8b1f05c09dfb21b2dc12756b56d59026450dee61452d2dea0f
 AUX xf86-video-intel-2.99.912-disable-dri3.patch 601 SHA256 03304d86ae442b1c7a0f2a1e80f0d48d2c6093fd9cc7067c8e8390e72efe61a5 SHA512 156fe8bbf6b381c9bed97241c249a3f4ce6e417776c618dbf711fd52d35088b8990eb59cc9ad881d5266a32e6b5e265833084f99281f73282f35fac775f4217e WHIRLPOOL a55c2cdc46a2b966ddf0853e033e2cc15145abc358accfed250c807d7bcc5a96196294c3de5f47d72af5e1db581615c0ea34fbd799d8173dc7c05071f6e2764e
+AUX xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch 2048 SHA256 54298cb4a59016be0451e3ea72b2c2c6b2a97cb9ec2c8f45d62c12447d14b361 SHA512 003fc22a9446cdfcb8d51cbface096187f93a0c54b024ee34b160ca41a491c35e8b387caabc3c3f6411b93663c5119f48dc2adae0d76878723c02483306972ac WHIRLPOOL 1ca1d5c711b3ac48bd27fd9dda5fd33cd7269a42cc9fcb4c5c111365943dc617a8b32e3223059b76329cba22ebe0553a9178c25169a92b2246952cb62472593d
 AUX xf86-video-intel-2.99.917-sna-udev-fstat.patch 1902 SHA256 ffbfae1a4b8577fbbb07f9fe7458afdc95c75abf8b56e8604326f1063d7f257a SHA512 33f22e7cf974cb0c285572c7d760d5308e3db1738794df237327559c8fb2581446ebca499a020f4a6e1ad70149e05cd326979d8da06b1df52062a702f72b6901 WHIRLPOOL bf64dba9567d021fdb9227db078e818bd6a9336382f89cf6ae3b1e09692c71e3d3071e76377534a31d276f08e6b950843dbb89ae6c0ae36c9c93051f1222cd98
 AUX xf86-video-intel-2.99.917-uxa-udev-fstat.patch 855 SHA256 c9735095020e0572a5e9ce4b2c18a825a2baa19ebaea5258b2c9d539d5339aa5 SHA512 e309ed75144f910cd5cebf509e9d908a72d137fca4b054bb9b9a97887523d9745c6c556c5b5d8f72025e4eb149694dd6235e6c0a31892500e1993fdc4cdca2c4 WHIRLPOOL 1820e632cbdadac17d7a25a9580b0f52af772e318ebca6afedab4d5a0169223154ab58ebc9f02de8e33a27bcfc5e7bd9e1d73548fc36975059363dca916c997c
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
@@ -35,25 +36,26 @@ EBUILD xf86-video-intel-2.99.910.ebuild 1563 SHA256 1a183e44b5272923c737c7bcec7f
 EBUILD xf86-video-intel-2.99.914.ebuild 1663 SHA256 d5f2de599b881e059b8807dc04703568b07a99c90a6449bf7a0d0ba1a07f690d SHA512 393abcdda6072eca5e1069c54f1fcd5e2e716c1b86d0d43542e1ce9b57bdd897ff2e8cf6ccfd53e1334056c93c90896f537a7c07d0ad40e6b8f621c3c6717f74 WHIRLPOOL e0b099ec041c7cffb5a32d395b40f96b60faf0b8b22922e0a174040eb0d258f62b084947e060e1c264d9f75bf611ea35aff115cde5cb387f5eed1641b776fe40
 EBUILD xf86-video-intel-2.99.916.ebuild 1663 SHA256 42d7c0e643c8761292d6c54577f0781682e6263b6a7cd470a33cc2d33982a83c SHA512 917d58de58a4530482bae13077a0bb661fb5fcc434b281bf1ce017e2cb01dcfe5fc1b0d7cd07bc34d13f18d99768ba3d61a32987205e1c1d272c9aa62d97ba4d WHIRLPOOL 48f02b23d4f7e504bcf5e74a114e945cf4179761564c034a52c56a55e0035916e3c352812c224ee67f189ab69018da4ecd2fbed980ec0996f245938d5a02bf17
 EBUILD xf86-video-intel-2.99.917-r1.ebuild 1640 SHA256 a1e3af15d3f022c255f2e4aafb1f4630e1813b84dd536735adabb650a36baab8 SHA512 8496be3d468ffbaad67d9f492bfd1904f94f18f1a5b17bd6f5a3000179325cbaa36729edcc8c3bffb42b8adff1faf93715ecaae92267b600d320fe1dbd5c6382 WHIRLPOOL 74c8e7f7e5563540de0a71f7973b898beb85948fe0cddc3ed5b547334d47c0b4d2b71374d9d2836d0855770ca704468b1eb06d82e4d08348af5e20213ae0201e
+EBUILD xf86-video-intel-2.99.917-r2.ebuild 1690 SHA256 1311f83b16607c58531c321d5fb6e16e7968eb9ab5e6264eaf91e63c7a4f0501 SHA512 e36ea1c0878278ec8ef12e43614536d67a0435a7a842f2c18cf8c7688f1535c29ced53ab074fa2599c5fe271c5d807b0548585e8be6c2dc7f7d3f18de0ccb25d WHIRLPOOL c1b4210286a9b5d611ff57a0d7d43bdfc3c403f91c29e6330b169d60f09ddaa277921a459d982ac0e716e0aac35ae432b1789b1aaff8d18a8b6d245e498c4066
 EBUILD xf86-video-intel-2.99.917.ebuild 1535 SHA256 0f356548d36166d655dac9ee99fdb23a696333d79eb9d6af447e0304f071ceb8 SHA512 843dbd333e5c7e48707e3f372220f966e44db92d834acf07e7aecb98b2b0bee49931d6f4681d75c470dbc65c487a5c015a77ef8a76b02308ca72b67e3fc3b262 WHIRLPOOL a0d8f0401e854b6faff4baaed4f71184847461e77d619f3c0a8dedc2684f2d8c7ddc6d4210e308edd48b5c923f6450bfa8c8adf0775cc359eee00f9933a54d7f
-MISC ChangeLog 61101 SHA256 61e0faa80cf809da11e018f0f980f0c0b2da21eaf69adab0bb3f10a46da5e695 SHA512 b16871b3f5bf5b52c8b86b83f0700a0131b6f12a4222a05ddb1cce69b79af41671024b5caa049889a75aab4402d38638344d69cd1de92406918a2c0aa0bb5ec8 WHIRLPOOL 7c205069bbddbebeeeda194287064c51bd29be3d03b0f40e47e93f85af00d0013681ab6e3c2fa7fd6faebde2dc41eecdbf90331ab3a91fd1b22423a765b2e8e6
+MISC ChangeLog 61390 SHA256 bbe37f227e9b5ba9e147ece0bb6b36dbd850e87223bdb6e90fd7be0b7943ee47 SHA512 41f11974eab5b993f6cdfe084f3b62cc6740ed5d8a87ce1d795a3e4972c175fd4d420a9468a5951f7e728ae00f1a3a477cca0db2a2aa11448d6e8a3f870c56a9 WHIRLPOOL 276c133bde7084c99cf9c7a975137d2cf34be3f46465c855334b6cee42b3f67b58392221b0fd35907bb7f5727a7e31fdc111d3af911ddeacb8a3a7de7071d85d
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVfLSDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfsSiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRPT8QAI44ohYL7yjctSRiYJM20nk2
-xIDYPmApPjj4itTxO7ds5pMvy0S1M59ZbcuLh3nT/W8dtJ/FbpXf/BGxNUhcV++7
-7je9DpsFRFjrx1kueISirlGH+58w3sJRoe/4+wAIQIfQKfmKFBRL50Yl0aWff8ru
-SMZU3aSxHeMIDsv/7itw7FYvnuWp1IZ4XvjDtGSEShBMyMvG0De1JjIf86os1uyE
-h3miY6FHChuTsVEbdXYx8l5cqLvYDWcHufhQdsZ46xJKFqzZBq2kpiUXRQvHJTML
-51MBqoisEwBqGmb0yXBNn2YTXU+ypmdb+Pl8TXqottNwmsuNQ+ErydfHdBF7JrHV
-JHrohl07ilCOY2MRvU9TG16wc7j82gBM49wiE8brFIz047cLBGegWuatY9pGz7oZ
-ZkZcXhBDB/ZeDJb+31PFAa4kBgoLEx9e5gnfDoPJ4z1rWa1TYujfHdngLG+YYLyk
-5xHeFm5XZ1kghFegq6BrSqxK6EdCpUpZbSKtdRGuUKGElP49ZfHx7UPdPMfbbVGt
-BuQTsKplXRtEK8yNplAosws7YUOrulst8nATj9WWV3xn/WQ8SQG8fl2lAT611sqe
-FOe700yto6yQetPFesXkTWg9c5r89QT+ym2u6Qu5pTpCMQal5E5ZrRB5JwV/lh9P
-A6rauL8xwbWtX+bZRTdw
-=HCwr
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRFKAQAJjwZ78F3opXGr8OF5AURh0D
+vo2jnqHR7It5qfOiCX/F6uIbse+9978YK91f2k8U2DDNWDaFUMljoWWaIVJHRVoK
+z3H+8InYFCUAV2KxVlOSSNhX7pYGEPjHkG2P/JhJlWUqtkzocuj7mH75X4P1A0Mr
+vAzpNl/3TWxHw42iW2cri5xvrgnBopH5zKrUiZTY41ip55xOhhXu0wbeWqzMuXC8
+FEoW1LWpJBA60sNAU2l4xaAJ0iyFGfolxqgYMvbXOTHpSSJfBadlm08sOVyL/LFr
+LJHNK0jAOtLi6wvpt5XTaYVog5aBVHgyaCfQgnuy+VioYbZ7X8FbNFKOSPRIZnCH
+CXvxZFDrHE1HUTKQlqhM5YbpEKUDuvBW8Kig4F5p/ME8hItyByo8vUgjYNxAb5uR
+/z8aumpH15WJ6Z5soOim4NGHrcyDoMIaEb3szacQzx2qIszhnabK3P8X+Bs2okrR
+xriOe24lC5p7nd8dFYREyZQxt22BgOY9atF2xlHTPnv4aJ4FK3ro7tgMDjuzElb/
+NHnNRCA7E1/LgXTl3iBLOKaZy2SNNaMLRonniD3v+AdORGkuURRcspEdmL1/Hh46
+4m2ePJ25+jrhW7vpcW6EsP0BDjfd0ShFTWQVnyEnfFgBgkpwTXC5/ag0430e30gj
+VLyzn7QhW/7NEuzBscSy
+=bPwI
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
new file mode 100644
index 000000000000..ea3aa30ed13c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
@@ -0,0 +1,65 @@
+From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 19 Mar 2015 23:14:17 +0000
+Subject: sna: Protect against ABI breakage in recent versions of libdrm
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 11f0828..6f16cba 100644
+--- a/src/sna/kgem.c
++++ b/src/sna/kgem.c
+@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
+ #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
+ #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
+ 
++struct local_i915_gem_mmap {
++	uint32_t handle;
++	uint32_t pad;
++	uint64_t offset;
++	uint64_t size;
++	uint64_t addr_ptr;
++};
++#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
++
+ struct local_i915_gem_mmap2 {
+ 	uint32_t handle;
+ 	uint32_t pad;
+@@ -514,15 +523,15 @@ retry_wc:
+ 
+ static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
+ {
+-	struct drm_i915_gem_mmap mmap_arg;
++	struct local_i915_gem_mmap arg;
+ 	int err;
+ 
+ retry:
+-	VG_CLEAR(mmap_arg);
+-	mmap_arg.handle = bo->handle;
+-	mmap_arg.offset = 0;
+-	mmap_arg.size = bytes(bo);
+-	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
++	VG_CLEAR(arg);
++	arg.handle = bo->handle;
++	arg.offset = 0;
++	arg.size = bytes(bo);
++	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
+ 		assert(err != EINVAL);
+ 
+ 		if (__kgem_throttle_retire(kgem, 0))
+@@ -536,10 +545,10 @@ retry:
+ 		return NULL;
+ 	}
+ 
+-	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
++	VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
+ 
+ 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
+-	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
++	return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
+ }
+ 
+ static int gem_write(int fd, uint32_t handle,
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r2.ebuild
new file mode 100644
index 000000000000..ed5e1de5557f
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r2.ebuild,v 1.1 2015/06/15 12:26:19 chithanh Exp $
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="debug +sna +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sna-udev-fstat.patch
+	"${FILESDIR}"/${P}-uxa-udev-fstat.patch
+	"${FILESDIR}"/${P}-libdrm-kernel-4_0-crash.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+		--disable-dri3
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}