--- xserver-xorg-video-intel-2.21.14.orig/ChangeLog +++ xserver-xorg-video-intel-2.21.14/ChangeLog @@ -1,3 +1,9 @@ +commit 0cd154039ab02799dc972d93c415e762226df1aa +Author: Chris Wilson +Date: Sun Aug 4 10:30:14 2013 +0100 + + 2.21.14 release + commit a5bf389908934aa4f9493a4a35b18e4aec9c8103 Author: Chris Wilson Date: Sat Aug 3 14:54:31 2013 +0100 --- xserver-xorg-video-intel-2.21.14.orig/RELEASING +++ xserver-xorg-video-intel-2.21.14/RELEASING @@ -0,0 +1,52 @@ +The process for releasing a new tarball is as follows: + +1. Make sure you have the latest build requirements installed: + + git://git.freedesktop.org/git/util/macros + git://git.freedesktop.org/git/util/modular + +2. Add relevant release notes to the NEWS files + + Skim the git log since the last release, and add notes in a + similar style to previous releases. + + For major releases list added features and known limitations. + + For minor releases indicate which bugs were fixed and which + are still present. + + +3. Update your module version (usually found in configure.ac) + + $ vi configure.ac # bump version + $ git commit + $ git push origin # make sure you're on the release branch + +4. Verify your module builds + + $ make distcheck + +5. Tag the release + + $ git tag -m "Intel release" + +6. Run the release script (this should push the tag) + + $ /util/modular/release.sh driver + +7. Edit and send the generated release message. + + At the very least, add the release notes from the NEWS file. + + The message is generated as xf86-video-intel-.announce + + For snapshots and release candidates, mail to: + + intel-gfx@lists.freedesktop.org + + For major releases also send to: + + xorg@lists.freedesktop.org + xorg-announce@lists.freedesktop.org + +8. Throw a release party, you're done! :) --- xserver-xorg-video-intel-2.21.14.orig/autogen.sh +++ xserver-xorg-video-intel-2.21.14/autogen.sh @@ -0,0 +1,14 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi --- xserver-xorg-video-intel-2.21.14.orig/src/sna/brw/brw_eu_util.c +++ xserver-xorg-video-intel-2.21.14/src/sna/brw/brw_eu_util.c @@ -0,0 +1,126 @@ +/* + Copyright (C) Intel Corp. 2006. All Rights Reserved. + Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to + develop this 3D driver. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + **********************************************************************/ + /* + * Authors: + * Keith Whitwell + */ + + +#include "brw_context.h" +#include "brw_defines.h" +#include "brw_eu.h" + + +void brw_math_invert( struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src) +{ + brw_math( p, + dst, + BRW_MATH_FUNCTION_INV, + BRW_MATH_SATURATE_NONE, + 0, + src, + BRW_MATH_PRECISION_FULL, + BRW_MATH_DATA_VECTOR ); +} + + + +void brw_copy4(struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src, + GLuint count) +{ + GLuint i; + + dst = vec4(dst); + src = vec4(src); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), byte_offset(src, delta)); + brw_MOV(p, byte_offset(dst, delta+16), byte_offset(src, delta+16)); + } +} + + +void brw_copy8(struct brw_compile *p, + struct brw_reg dst, + struct brw_reg src, + GLuint count) +{ + GLuint i; + + dst = vec8(dst); + src = vec8(src); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), byte_offset(src, delta)); + } +} + + +void brw_copy_indirect_to_indirect(struct brw_compile *p, + struct brw_indirect dst_ptr, + struct brw_indirect src_ptr, + GLuint count) +{ + GLuint i; + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, deref_4f(dst_ptr, delta), deref_4f(src_ptr, delta)); + brw_MOV(p, deref_4f(dst_ptr, delta+16), deref_4f(src_ptr, delta+16)); + } +} + + +void brw_copy_from_indirect(struct brw_compile *p, + struct brw_reg dst, + struct brw_indirect ptr, + GLuint count) +{ + GLuint i; + + dst = vec4(dst); + + for (i = 0; i < count; i++) + { + GLuint delta = i*32; + brw_MOV(p, byte_offset(dst, delta), deref_4f(ptr, delta)); + brw_MOV(p, byte_offset(dst, delta+16), deref_4f(ptr, delta+16)); + } +} + + + + --- xserver-xorg-video-intel-2.21.14.orig/debian/watch +++ xserver-xorg-video-intel-2.21.14/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-intel +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-intel-(.*)\.tar\.gz --- xserver-xorg-video-intel-2.21.14.orig/debian/rules +++ xserver-xorg-video-intel-2.21.14/debian/rules @@ -0,0 +1,61 @@ +#!/usr/bin/make -f + +SOURCE_NAME := $(shell dpkg-parsechangelog | awk -F': ' '/^Source: / {print $$2}') +SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}') +BUILDER := $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}') + +export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifeq ($(DEB_HOST_ARCH), linux) +valgrind = --enable-valgrind +else +valgrind = --disable-valgrind +endif + +# Enable SNA, pass builderstring: +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-sna \ + --enable-uxa \ + --with-default-accel=sna \ + --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ + --disable-silent-rules \ + $(valgrind) + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, libxvmc symlinks, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + rm -f debian/tmp/usr/lib/libI810XvMC.so + rm -f debian/tmp/usr/lib/libIntelXvMC.so + dh_install --fail-missing + +# Debug package: +override_dh_strip: + dh_strip --dbg-package=xserver-xorg-video-intel-dbg + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ + +# Snapshots should only target experimental: +generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 's/^[0-9]*://;s/-.*$$//') +generate-snapshot: UPSTREAM_BRANCH ?= upstream-experimental +generate-snapshot: ORIG = ../$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz +generate-snapshot: + if [ -f $(ORIG) ]; then \ + echo "$(ORIG) already exists, stopping"; exit 1; \ + fi + git archive --format=tar --prefix=$(SOURCE_NAME)-$(UPSTREAM_VERSION)/ $(UPSTREAM_BRANCH) \ + | gzip -9 > $(ORIG) + pristine-tar commit $(ORIG) $(UPSTREAM_BRANCH) --- xserver-xorg-video-intel-2.21.14.orig/debian/changelog +++ xserver-xorg-video-intel-2.21.14/debian/changelog @@ -0,0 +1,1418 @@ +xserver-xorg-video-intel (2:2.21.14-4ubuntu2) saucy; urgency=low + + * Re-add changes to xmir. + + -- Maarten Lankhorst Thu, 15 Aug 2013 10:36:22 +0200 + +xserver-xorg-video-intel (2:2.21.14-4ubuntu1) saucy; urgency=low + + * New upstream release. (LP: #1204261, #1203273, #1172450) + * Cherry-pick upstream patch to fix a crash when changing resolution. (LP: #1212344) + * Merge against released debian-unstable. + * Drop upstreamed patches. + * Remaining changes: + - Use SNA by default. + - Add support for XMIR. + + -- Maarten Lankhorst Thu, 15 Aug 2013 10:07:19 +0200 + +xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low + + * Link the driver against pixman to get correct dependency (closes: #719518). + Thanks to Martin Perazzo for the report! + + -- Julien Cristau Mon, 12 Aug 2013 19:48:43 +0200 + +xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low + + * Add patch to deal with missing 'struct sysinfo' in kfreebsd's + . + + -- Julien Cristau Mon, 12 Aug 2013 15:31:14 +0200 + +xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low + + * Don't enable valgrind on kfreebsd. + + -- Julien Cristau Mon, 12 Aug 2013 10:09:25 +0200 + +xserver-xorg-video-intel (2:2.21.14-1) unstable; urgency=low + + * New upstream release (closes: #697336). + + [ Maarten Lankhorst ] + * Add valgrind to build-depends. + * Enable valgrind by default. + + [ Sven Joachim ] + * Drop patch 0002-Update-manpage-for-new-accelmethod-option.patch, + superseded by upstream changes. + * Use dpkg-buildflags. + * Disable silent build rules. + + [ Julien Cristau ] + * Add kfreebsd to the package's architecture list (closes: #671870). + + -- Julien Cristau Mon, 12 Aug 2013 08:12:23 +0200 + +xserver-xorg-video-intel (2:2.21.12-1ubuntu3) saucy; urgency=low + + * fix-preinit-cleanup-paths.patch: Upstream cherrypick to fix leaks in + sna_pre_init failure paths. Prerequisite for new XMir patch. + * xmir.patch: Update to follow upstream developments + + -- Christopher James Halse Rogers Thu, 15 Aug 2013 11:46:10 +1000 + +xserver-xorg-video-intel (2:2.21.12-1ubuntu2) saucy; urgency=low + + * Fix crash in sna_adjust_frame under XMir (LP: #1212065) + + -- Christopher James Halse Rogers Wed, 14 Aug 2013 14:06:13 +1000 + +xserver-xorg-video-intel (2:2.21.12-1ubuntu1) saucy; urgency=low + + [ Maarten Lankhorst ] + * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, #1200766) + Remaining changes: + - Use SNA by default. + + [ Robert Hooker ] + * Cherry-pick 3 commits from upstream git to fix SNA regressions in 2.21.12 + (34c9b759f, 7f76a2bf3, a764a6e69b) + + [ Christopher James Halse Rogers ] + * Add initial XMir support patch + + -- Christopher James Halse Rogers Thu, 01 Aug 2013 16:06:42 +1000 + +xserver-xorg-video-intel (2:2.21.9-0ubuntu2) saucy; urgency=low + + * sna-make-sure-the-source-is-coherent.diff: Fix corruptions on firefox + (LP: #1189850) + + -- Timo Aaltonen Tue, 11 Jun 2013 20:10:33 +0300 + +xserver-xorg-video-intel (2:2.21.9-0ubuntu1) saucy; urgency=low + + * Merge from unreleased debian git, remaining changes: + - Use SNA by default. + * Add support for haswell graphics. (LP: #1175533) + * Fix crash in xserver when using the unity dash. (LP: #118123) + + -- Maarten Lankhorst Thu, 06 Jun 2013 15:05:00 +0200 + +xserver-xorg-video-intel (2:2.21.7-0ubuntu1) saucy; urgency=low + + * Merge from unreleased debian git, remaining changes: + - Use SNA by default. + * rules: Add --enable-valgrind again. + * Drop sna-flush-scanout-cache-after-resizing.patch, upstreamed. + + -- Maarten Lankhorst Thu, 23 May 2013 09:44:44 +0200 + +xserver-xorg-video-intel (2:2.21.6-0ubuntu4) raring-proposed; urgency=low + + [Chris Arges] + * Add sna-flush-scanout-cache-after-resizing.patch: Flush the scanout + cache after resizing the display. Fixes a problem that occurs + e.g. when unplugging an external display, suspend/resume, etc. by + ensuring the scanout cache is properly sized. + (LP: #1157678) + + -- Bryce Harrington Fri, 19 Apr 2013 11:12:14 -0700 + +xserver-xorg-video-intel (2:2.21.6-0ubuntu3) raring-proposed; urgency=low + + * rules: Drop --enable-valgrind for now (causes FTBS). + + -- Bryce Harrington Mon, 15 Apr 2013 10:33:24 -0700 + +xserver-xorg-video-intel (2:2.21.6-0ubuntu2) raring; urgency=low + + * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup + apport hook. This hook is now provided by the xdiagnose package. + (LP: #997470) + * Re-merge from debian to enable valgrind. + + -- Bryce Harrington Thu, 11 Apr 2013 12:11:29 -0700 + +xserver-xorg-video-intel (2:2.21.6-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git + - new upstream minor release (LP: #1162046) + + -- Timo Aaltonen Tue, 09 Apr 2013 17:31:20 +0300 + +xserver-xorg-video-intel (2:2.21.5-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git + - new upstream release (LP: #1156387, #1156679) + + -- Timo Aaltonen Thu, 21 Mar 2013 15:51:49 +0200 + +xserver-xorg-video-intel (2:2.21.4-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git + - new upstream release (LP: #1124576, #1135403) + + -- Timo Aaltonen Mon, 11 Mar 2013 16:17:16 +0200 + +xserver-xorg-video-intel (2:2.21.3-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git + - new upstream release + + -- Timo Aaltonen Mon, 25 Feb 2013 10:32:15 +0200 + +xserver-xorg-video-intel (2:2.21.2-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git. + - new upstream release (LP: #1120108) + + -- Timo Aaltonen Mon, 11 Feb 2013 16:09:46 +0200 + +xserver-xorg-video-intel (2:2.21.0-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git. + - new upstream release (LP: #1104180) + * sna-compensate-clipextents.diff, upstream-snapshot-778dba90c.diff: + Deleted, were from upstream. + + -- Timo Aaltonen Tue, 05 Feb 2013 12:22:15 +0200 + +xserver-xorg-video-intel (2:2.20.19-0ubuntu3) raring; urgency=low + + * sna-compensate-clipextents.diff: Compensate clipExtents for drawable + offset (LP: #1104041). Thanks Matthieu Baerts! + + -- Timo Aaltonen Fri, 25 Jan 2013 09:44:38 +0200 + +xserver-xorg-video-intel (2:2.20.19-0ubuntu2) raring; urgency=low + + * upstream-snapshot-778dba90c.diff: Patch to update to current git + master (LP: #1102390). + + -- Timo Aaltonen Thu, 24 Jan 2013 10:22:41 +0200 + +xserver-xorg-video-intel (2:2.20.19-0ubuntu1) raring; urgency=low + + * Merge from unreleased debian git + * rules: Use SNA as the default acceleration method. + + -- Timo Aaltonen Mon, 21 Jan 2013 10:18:31 +0200 + +xserver-xorg-video-intel (2:2.20.14-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream bugfix release. + - Fixes a long-standing bug in UXA pageflip code that was the + source of many GPU hangs. + + -- Julien Cristau Sun, 02 Dec 2012 19:18:05 +0100 + +xserver-xorg-video-intel (2:2.20.5-1) experimental; urgency=low + + * New upstream release. + - Remove patch to support passing a builder string, merged upstream + 0001-Fix-build-failure-when-passing-with-builderstring.patch + + -- Julien Danjou Sun, 26 Aug 2012 14:25:55 +0200 + +xserver-xorg-video-intel (2:2.20.2-1) experimental; urgency=low + + [ Maarten Lankhorst ] + * New upstream release: + - First official release with sna + * Update to 2.20.1 point release: + - A bug affecting gen4 handling of trapezoids was fixed, and CPU + overhead reduced. + https://bugs.freedesktop.org/show_bug.cgi?id=52158 + - A fix for a bug causing corruption of a DRI2 unredirected client + window that was resized whilst under a compositor. + - Support for snoopable buffers on non-LLC architectures, coming to + a future kernel. The aim to accelerate transfers between the CPU + and the GPU, in particular to dramatically improve readback + performance, and to further minimise clflushes. + - Improvement to the composite performance on GT2 SandyBridge and + IvyBridge devices, in particular the render copy is significantly + improved. + - Improved handling for when acceleration is disabled, including + permitting DRI2 to remain supported even if the X server believes + the GPU wedged. + - Shadow support was dropped from UXA as it was neither complete nor + correct, use SNA instead. + + [ Julien Danjou ] + * New upstream release (2.20.2) + + -- Julien Danjou Sun, 29 Jul 2012 00:06:11 +0200 + +xserver-xorg-video-intel (2:2.19.0-6) unstable; urgency=low + + * Stop installing i915-kms.conf. It's not necessary with the wheezy kernel. + Keep it around on upgrade, though, to allow booting on the squeeze kernel. + + -- Julien Cristau Sun, 16 Sep 2012 20:46:52 +0200 + +xserver-xorg-video-intel (2:2.19.0-5) unstable; urgency=high + + * Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion + + -- Julien Cristau Fri, 27 Jul 2012 10:54:27 +0200 + +xserver-xorg-video-intel (2:2.19.0-4) unstable; urgency=medium + + [ Julien Cristau ] + * uxa: Check for DPMS off before scheduling a WAIT_ON_EVENT. Fixes + regression from a cherry-pick in 2:2.19.0-2 (Closes: #677466). + Thanks to Julian Andres Klode for tracking this down. + + -- Cyril Brulebois Sat, 23 Jun 2012 21:06:26 +0200 + +xserver-xorg-video-intel (2:2.19.0-3) unstable; urgency=low + + * Add patch to avoid X segfaults with Driver-less Device sections in + xorg.conf (Closes: #677206): + - 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch + + -- Cyril Brulebois Tue, 12 Jun 2012 20:30:51 +0200 + +xserver-xorg-video-intel (2:2.19.0-2) unstable; urgency=low + + * Cherry-pick the following commits to make it possible to build both + uxa (legacy acceleration method) and sna (experimental acceleration + method): + - 3f3bde4f0c uxa: Only consider an output valid if the kernel reports it attached + - df6ab02c36 Unify options handling between UXA and SNA + - e456291350 Allow runtime switching of AccelMethod between uxa/sna and even glamor + - 318982566b sna/dri: Disable experimental code by default + - 7614a54188 configure: Harden --with-default-accel against simple mistakes + - 4e984b79cc configure: Correct the help string for --with-default-accel + * rules: Enable sna and uxa accel methods, default to uxa. The switch + to sna can be achieved through a minimal xorg.conf (look for “AccelMethod” + in: man intel). + * Add patch to document the new AccelMethod option accordingly: + - 0002-Update-manpage-for-new-accelmethod-option.patch + + -- Cyril Brulebois Mon, 11 Jun 2012 22:22:00 +0000 + +xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low + + * New upstream release. + + -- Julien Cristau Sat, 26 May 2012 12:38:07 +0200 + +xserver-xorg-video-intel (2:2.18.0-2) unstable; urgency=low + + * Cherry-pick a change from upstream to fix a bug triggered by cairo 1.12: + uxa: Remove broken render glyphs-to-dst + + -- Julien Cristau Thu, 05 Apr 2012 20:24:22 +0200 + +xserver-xorg-video-intel (2:2.18.0-1+exp1) experimental; urgency=low + + * Enable SNA again, in experimental. + + -- Cyril Brulebois Fri, 24 Feb 2012 14:19:00 +0100 + +xserver-xorg-video-intel (2:2.18.0-1) unstable; urgency=low + + * New upstream release. + * No SNA for unstable, it's too fast of a moving target for now. + * Since we're building for unstable, let's go back to the previous + xorg-server build-dep. + + -- Cyril Brulebois Fri, 24 Feb 2012 14:16:47 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120204-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 24ece4a87e. + + -- Cyril Brulebois Sat, 04 Feb 2012 09:20:13 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120115-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 5df7147b09. + + -- Cyril Brulebois Mon, 16 Jan 2012 00:52:23 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120104-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 4119e68fb1. + * Implement a generate-snapshot rule to ease packaging snapshots. + + -- Cyril Brulebois Wed, 04 Jan 2012 22:19:19 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120101-2) experimental; urgency=low + + * Build against Xserver 1.12 RC1 (Closes: #653914). + + -- Cyril Brulebois Sun, 01 Jan 2012 14:58:27 +0100 + +xserver-xorg-video-intel (2:2.17.0+git20120101-1) experimental; urgency=low + + * New upstream snapshot: + - Merge from upstream master up to 770a953ff0. + * Enable SNA support, as suggested by upstream. It should be usable now + and regression reports are welcome. + * Add patch to support passing a builder string: + - 0001-Fix-build-failure-when-passing-with-builderstring.patch + * Pass a builder string, as done in the server. + + -- Cyril Brulebois Sun, 01 Jan 2012 06:34:09 +0100 + +xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. (Closes: #635953) + + -- Cyril Brulebois Sat, 19 Nov 2011 12:46:57 +0100 + +xserver-xorg-video-intel (2:2.16.0-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Sun, 28 Aug 2011 13:15:24 +0200 + +xserver-xorg-video-intel (2:2.15.901-1) experimental; urgency=low + + * Re-enable XvMC. + * New upstream snapshot. + * Build against xserver 1.10.99.x. + + -- Julien Cristau Mon, 01 Aug 2011 01:37:49 +0200 + +xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high + + * Temporarily disable xvmc to sidestep the xcb-util mess and move to + testing. + + -- Julien Cristau Sat, 14 May 2011 19:00:38 +0200 + +xserver-xorg-video-intel (2:2.15.0-2) unstable; urgency=low + + * xcb-util was split up in 0.3.8 and libxcb-aux has been merged + into libxcb-util, thus update Build-Depends accordingly. + * Add ${misc:Depends} to xserver-xorg-video-intel-dbg Depends. + + -- Arnaud Fontaine Fri, 06 May 2011 23:53:39 +0900 + +xserver-xorg-video-intel (2:2.15.0-1) unstable; urgency=low + + * New upstream release. + * Merge from upstream master up to c9fb69cb25 to fix crashes with i965 + and kwin in particular, thanks to Julian Andres Klode and Modestas + Vainius for their reports in Debian and upstream (Closes: #622653): + - NEWS: typo. + - intel: Beware the unsigned promotion when checking for batch overflows + - i965/video: We need 150 dwords of space for video state emission + + -- Cyril Brulebois Tue, 19 Apr 2011 03:37:23 +0200 + +xserver-xorg-video-intel (2:2.14.902-1) unstable; urgency=low + + * New upstream snapshot (2.15 rc2). + * Apparently, using libXvMC means adding the name of the library (like + libI810XvMC.so.1 or libIntelXvMC.so.1) to the libXvMC configuration + file (/etc/X11/XvMCConfig). Accordingly, remove extraneous symlinks: + - /usr/lib/libI810XvMC.so + - /usr/lib/libIntelXvMC.so + * Override lintian warning about the libXvMC shared objects. + + -- Cyril Brulebois Sun, 10 Apr 2011 23:30:19 +0200 + +xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low + + * Cherry-pick from upstream: + - uxa: Fallback if the temporary is too large + * This fixes a null pointer dereference with some rendering operations + involving large pictures (Closes: #613830). Thanks, Enrico! + + -- Cyril Brulebois Fri, 18 Feb 2011 12:44:23 +0100 + +xserver-xorg-video-intel (2:2.14.0-3) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + - Specify usr/share/man in .install, remove .manpages accordingly. + - Specify NEWS and README in .docs file. + * Get rid of maintainer scripts, since they were only used to handle + switching between versions with or without KMS. Starting with squeeze, + KMS is mandatory, so stop worrying about that. + * Remove xsfbs accordingly. + * Remove leftovers: + - NEWS file is outdated, UMS is no longer available, and that's + covered by README.Debian + - The .install.hurd-i386 file is no longer relevant, this package is + now Linux-only. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces. + * Wrap Depends/Provides/Recommends. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:47:04 +0100 + +xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low + + * Cherry-pick from upstream to fix many rendering issues + (https://bugs.freedesktop.org/show_bug.cgi?id=33650): + - uxa: Undo damage translation before appending + + -- Cyril Brulebois Fri, 04 Feb 2011 15:37:47 +0100 + +xserver-xorg-video-intel (2:2.14.0-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Sat, 08 Jan 2011 18:10:23 +0100 + +xserver-xorg-video-intel (2:2.13.903-1) experimental; urgency=low + + [ Robert Hooker ] + * Add libudev-dev to the build deps for monitor hotplug detection + events. + + [ Cyril Brulebois ] + * New upstream release candidate. + * Bump libdrm-dev build-dep. + * Drop libdrm-from-sid-is-ok.diff accordingly. + + -- Cyril Brulebois Tue, 04 Jan 2011 15:43:17 +0100 + +xserver-xorg-video-intel (2:2.13.901-2) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Tue, 09 Nov 2010 15:53:43 +0100 + +xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low + + * New upstream release candidate. + * Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked + changes to allow this release candidate to build and run. + * Drop patch: i8xx-shadow.diff + + -- Cyril Brulebois Tue, 09 Nov 2010 14:54:21 +0100 + +xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low + + [ Cyril Brulebois ] + * Merge from experimental. + * Lower build-dep on libdrm-dev from 2.4.22 to 2.4.21-1~squeeze3 since + the latter contains the needed bits, making it possible to build + within unstable. + * Add patch to make configure.ac happy: libdrm-from-sid-is-ok.diff + * Add README.Debian documenting the need for a kernel driver to handle + modesetting. + * Drop shadow-no-dri2.diff, obsoleted by upstream's 537e73f3. + + [ Julien Cristau ] + * Update i8xx-shadow.diff. + + -- Cyril Brulebois Sun, 07 Nov 2010 19:51:56 +0100 + +xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low + + [ Sven Joachim ] + * New upstream release. + * Bump libdrm build-dependency to 2.4.22. + + [ Cyril Brulebois ] + * Bump xutils-dev build-dependency to 1:7.5+4 (needed for xorg macros + 1.8). + * Picked from unstable to avoid introducing back binaries on non-Linux + architectures: UMS is gone, this means Linux-only. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 02 Oct 2010 09:51:48 +0200 + +xserver-xorg-video-intel (2:2.12.0+shadow-2) unstable; urgency=low + + * UMS is gone, this means Linux-only (closes: 597845). + + -- Julien Cristau Thu, 23 Sep 2010 16:40:26 +0200 + +xserver-xorg-video-intel (2:2.12.0+shadow-1) unstable; urgency=low + + * Revert the come-back of UMS. Update to upstream HEAD instead. + Closes: #594623, #594338. + * Dropping UMS means its bugs are irrelevant, so this closes: #570766, + #594815. + * Bump libdrm build-dep for DRM_MODE_CONNECTOR_eDP. + * Don't enable DRI2 if the shadow option is on. + * Use shadowfb on i8xx by default. Hopefully closes: #570988, #572105, + #576848, #592586, #593293. + * New upstream doesn't assert() when running sm (closes: #593199). + + -- Julien Cristau Mon, 20 Sep 2010 19:44:14 +0200 + +xserver-xorg-video-intel (2:2.12.0+legacy1-1) unstable; urgency=low + + * Merge from people.freedesktop.org/~ickle/xf86-video-intel:legacy. + This reintroduces UMS and EXA for legacy chips, while allowing us to get + the fixes and new hw support from 2.12. + + -- Julien Cristau Tue, 24 Aug 2010 21:33:56 +0200 + +xserver-xorg-video-intel (2:2.12.0-1) experimental; urgency=low + + * New upstream release. + + Fix Xv distortion, closes: #581705. + * Bump libdrm build-dependency to 2.4.21. + + -- Brice Goglin Sat, 26 Jun 2010 00:26:59 +0200 + +xserver-xorg-video-intel (2:2.11.0-1) experimental; urgency=low + + * New upstream release. + + -- Brice Goglin Tue, 30 Mar 2010 07:04:52 +0200 + +xserver-xorg-video-intel (2:2.10.903-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Tue, 23 Mar 2010 07:39:23 +0100 + +xserver-xorg-video-intel (2:2.10.902-1) experimental; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Brice Goglin ] + * New upstream release candidate, closes: #567829. + + User mode-setting is not supported anymore. + * Bump xutils-dev build dependency for new util-macros. + * Bump libdrm build dependency to 2.4.18-3 for latest i915 drm headers. + * Build depend on libx11-xcb-dev, libxcb-aux0-dev and libxcb-dri2-0-dev + for XVMC. + * Recommends intel-gpu-tools since intel_reg_dumper is not provided + by xserver-xorg-video-intel-dbg anymore. + + -- Brice Goglin Tue, 16 Mar 2010 20:53:53 +0100 + +xserver-xorg-video-intel (2:2.9.1-4) unstable; urgency=medium + + * Update xsfbs, use new ${xviddriver:Depends} subsvar. + + -- Julien Cristau Fri, 14 May 2010 17:44:44 +0200 + +xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Add a NEWS.Debian entry about KMS. + * Backport KMS video overlay from upstream 2.10 (closes: #565328). + * Bump libdrm-dev build-dep for the above. + + [ Brice Goglin ] + * Bump Standards-Version to 3.8.4, no changes. + + -- Brice Goglin Sun, 21 Mar 2010 10:25:27 +0100 + +xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 07 Jan 2010 20:53:45 +0000 + +xserver-xorg-video-intel (2:2.9.1-1+exp1) experimental; urgency=low + + [ Julien Cristau ] + * Enable kernel mode setting by default on linux (closes: #555906). + + [ Brice Goglin ] + * Build against xserver 1.7. + + -- Brice Goglin Wed, 02 Dec 2009 15:50:17 +0100 + +xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium + + * New upstream bugfix release (closes: #508005). + + reverts change from 2.9.0 that broke DVI detection for some people + (closes: #548045) + + -- Julien Cristau Wed, 25 Nov 2009 16:32:29 +0100 + +xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Tue, 29 Sep 2009 07:16:54 +0200 + +xserver-xorg-video-intel (2:2.8.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash on server regen, closes: #543326. + + -- Brice Goglin Wed, 23 Sep 2009 01:03:49 +0200 + +xserver-xorg-video-intel (2:2.8.1-2) unstable; urgency=low + + * Re-enable render accel on 8xx. The major problem turned out to be related + to agp chipset flushing (see #541307), so hopefully this should work now. + * Add missing xsfclean dependency to debian/rules clean. + * Bump Standards-Version to 3.8.3 (no changes). + * Mention intel_reg_dumper in the debug package's long description. + + -- Julien Cristau Thu, 17 Sep 2009 20:55:47 +0200 + +xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low + + * New upstream release. + + Calculate the DVO relative offset in LVDS data entry to get the + DVO timing, closes: #538148. + + Fix sampler indexes on i965 planar video, closes: #513427. + + -- Brice Goglin Wed, 26 Aug 2009 09:50:15 +0200 + +xserver-xorg-video-intel (2:2.8.0-2) unstable; urgency=low + + [ Julien Cristau ] + * Disable UXA render accel on i8xx chips for now. It currently causes + hangs, and doesn't seem likely to get fixed quickly upstream + (closes: #527349). + * Reenable patch system and bring back quilt build-dep. + + -- Brice Goglin Fri, 31 Jul 2009 22:44:13 +0200 + +xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low + + * New upstream release. + + Fixes crash at startup if KMS is not used, closes: #537052. + + -- Brice Goglin Tue, 21 Jul 2009 16:23:39 +0200 + +xserver-xorg-video-intel (2:2.7.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash in drm_intel_gem_bo_unreference_locked, closes: #535772. + + -- Brice Goglin Tue, 14 Jul 2009 00:17:00 +0200 + +xserver-xorg-video-intel (2:2.7.99.901-2) experimental; urgency=low + + * Pull upstream fix for xvmc build. + * Update build-depends, and reenable xvmc. + + -- Julien Cristau Thu, 11 Jun 2009 18:52:10 +0200 + +xserver-xorg-video-intel (2:2.7.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Thu, 11 Jun 2009 08:18:49 +0200 + +xserver-xorg-video-intel (2:2.7.99.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Pull from upstream git branch 'master', commit 8e942b70. + * Bump libdrm-dev build-dep to 2.4.11. + * Merge changes from 2:2.7.1-1. + * Bump Standards-Version to 3.8.1. + + [ David Nusinow ] + * Add README.source + + -- Julien Cristau Thu, 28 May 2009 20:10:30 +0200 + +xserver-xorg-video-intel (2:2.7.99.1-1) experimental; urgency=low + + * New upstream release candidate. + * Stop installing libI810XvMC.so and libIntelXvMC.so for now. They are + disabled in configure for now because DRI1 is not supported anymore. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + -- Brice Goglin Wed, 29 Apr 2009 19:50:26 +0200 + +xserver-xorg-video-intel (2:2.7.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + [ David Nusinow ] + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + -- Brice Goglin Wed, 13 May 2009 07:14:50 +0200 + +xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 16 Apr 2009 07:11:09 +0200 + +xserver-xorg-video-intel (2:2.6.99.903-1) experimental; urgency=low + + * New upstream release candidate. + * Bump build-dep on libdrm-dev to 2.4.6. + + -- Brice Goglin Sat, 11 Apr 2009 22:45:57 +0200 + +xserver-xorg-video-intel (2:2.6.3-1) unstable; urgency=low + + * New upstream release. + * Bump build-dep on libdrm-dev to 2.4.5. + * Upload to unstable. + * Cherry-pick some patches from upstream git, so this doesn't FTBFS with the + new libdrm (closes: #523125) + + -- Julien Cristau Thu, 09 Apr 2009 10:25:22 +0100 + +xserver-xorg-video-intel (2:2.6.1-1) experimental; urgency=low + + * New upstream release. + * Build against xserver 1.6 rc1. + + -- Julien Cristau Thu, 22 Jan 2009 00:18:25 +0100 + +xserver-xorg-video-intel (2:2.6.0-1) experimental; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 15 Jan 2009 10:54:17 +0100 + +xserver-xorg-video-intel (2:2.5.99.2-1) experimental; urgency=low + + * New upstream release. + + doesn't crash on EnterVT with libdrm 2.4.3 (closes: #511263) + * Update libdrm-dev build-dep to 2.4.3. + + -- Julien Cristau Wed, 14 Jan 2009 08:08:20 +0100 + +xserver-xorg-video-intel (2:2.5.1-1) experimental; urgency=low + + * New upstream release. + * Wrap build-deps in debian/control. + * Build depend on libdrm-dev on all archs, since it's now required, and bump + the build dep to 2.4.1. + + -- Julien Cristau Sun, 23 Nov 2008 17:02:31 +0100 + +xserver-xorg-video-intel (2:2.4.2-1) experimental; urgency=low + + * Drop the xserver-xorg-video-i810 transitional package. + * Build against xorg-server 1.5. + * New upstream release (no changes from the previous snapshot other than the + version number). + + -- Julien Cristau Thu, 04 Sep 2008 02:49:59 +0200 + +xserver-xorg-video-intel (2:2.4.1-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Pull from 2.4-branch HEAD as of August 24th. + + -- Julien Cristau Sun, 24 Aug 2008 18:28:32 +0200 + +xserver-xorg-video-intel (2:2.4.0-1) experimental; urgency=low + + * New upstream release. + * Refresh patch 01_gen_pci_ids.diff. + * Don't handle the nostrip build option in debian/rules, dh_strip does that; + allow the parallel=n option. + * Run autoreconf at build-time; build-depend on automake, libtool and + xutils-dev. + * Drop the debian revision from the libxvmc-dev build-dep. + + -- Julien Cristau Sun, 27 Jul 2008 13:18:42 +0200 + +xserver-xorg-video-intel (2:2.3.2-3) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Julien Cristau Mon, 14 Jul 2008 01:26:43 +0200 + +xserver-xorg-video-intel (2:2.3.2-2+lenny1) unstable; urgency=low + + * Cherry-pick patches from the 2.4.0 release: + - Add support for Intel 4 series chipsets + - add some quirks to force enable pipe A on some machines: in particular, + all 855GM (closes: #482819), and Lenovo T60 (closes: #487672) + - i810: Remove an effectively unused variable (only used in an incorrect + free()) + - Give asus and eeepc backlight method higher priority + - Don't use the phase shift bits on GM45 + - Fix official name for GM45 chipset + - Improve FBC size checking + - Only initialize integrated TV encoder for mobile chips + - Add no LVDS quirk for Transtec Senyo 610 mini PC + - Thinkpad R60e TV quirk via DMI info + * Fix debian/rules build/patch dependencies. + + -- Julien Cristau Sun, 27 Jul 2008 11:44:09 +0200 + +xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high + + * High urgency upload for RC bug fix. + * Update debian/copyright, thanks to Thomas Viehmann for reporting, and + Moritz Muehlenhoff for the thorough analysis (closes: #486340). + * Change the libdrm memory manager check in configure to look for 2.4.0 + instead of 2.3.1, as libdrm 2.3.1 was released without it. + + -- Julien Cristau Thu, 03 Jul 2008 16:55:05 +0200 + +xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low + + * New upstream release. + + Revert "Add FIFO watermark regs to register dumper", + closes: #482369, #471413. + + Fix TV programming: add vblank wait after TV_CTL writes, + closes: #485616. + + -- Brice Goglin Wed, 18 Jun 2008 07:16:05 +0200 + +xserver-xorg-video-intel (2:2.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Mon, 12 May 2008 03:55:45 +0200 + +xserver-xorg-video-intel (2:2.3.0-1) experimental; urgency=low + + * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + * New upstream release. + + -- Julien Cristau Wed, 23 Apr 2008 17:53:26 +0200 + +xserver-xorg-video-intel (2:2.2.99.903-1) experimental; urgency=low + + * New upstream release candidate. + + Fix LVDS regression: disable panel fitting on 855GM, + and fix dither setting, closes: #473838. + + -- Brice Goglin Tue, 15 Apr 2008 15:04:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Disable DRI earlier if fb width > 2048, closes: #465421, #452357. + + -- Brice Goglin Mon, 31 Mar 2008 08:46:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.901-2) experimental; urgency=low + + * Install libIntelXvMC.so. + + -- Brice Goglin Sat, 29 Mar 2008 12:15:14 +0100 + +xserver-xorg-video-intel (2:2.2.99.901-1) experimental; urgency=low + + [ Julien Cristau ] + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * Bump Standards-Version to 3.7.3 (no changes). + + [ Brice Goglin ] + * New upstream release. + + Fix pciaccess version check, closes: #470266. + + Fix crash on VT switch, closes: #469113. + + Fix video playback on rotated display, closes: #432157. + + -- Brice Goglin Fri, 21 Mar 2008 21:50:59 +0100 + +xserver-xorg-video-intel (2:2.2.1-2) unstable; urgency=low + + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266). + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + -- Julien Cristau Sun, 13 Apr 2008 02:10:18 +0200 + +xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + + Fix some blinking pixels and unreadable text, closes: #465921. + + Fix i830 stolen memory mask, closes: #464661. + + Fix flickering on i855, closes: #443809, #435621. + + [ Julien Cristau ] + * Build the intel_reg_dumper tool, and install it in the -dbg package. + Add build-dependency on libpciaccess-dev. + + -- Brice Goglin Sat, 23 Feb 2008 00:52:39 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-3) unstable; urgency=low + + * Grab upstream commit 2c8f87be99957e0e18d8bcda46bd8706ab374253 + to unbreak FramebufferCompression on i965. + + -- Brice Goglin Wed, 06 Feb 2008 21:29:44 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-2) unstable; urgency=low + + * Actually pull the new upstream release candidate. + + -- Julien Cristau Wed, 06 Feb 2008 10:27:18 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-1) unstable; urgency=low + + * New upstream stable branch release candidate. Fixes the following bugs: + + server leaves pipe disabled at shutdown / vt switch ; closes: #453374 + + [855GM] need to use BIOS for mode information ; closes: #437066 + + Intel 2.2 crashes if playing a video then switching to another desktop; + closes: #452372 + + [G33] 2.2.0 locks up X with error "First SDVO output reported failure to + sync" ; closes: #451917 + + -- David Nusinow Tue, 05 Feb 2008 21:41:13 -0500 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1) experimental; urgency=low + + * New upstream snapshot + + Clarifies backlight abilities in the manpage. Closes: #451847 + + Will use a functional backlight on older chips now. Newer chips may + benefit from configured to use something other than the legacy setting + though. Closes: #451848 + + Fixes exa rendering corruption on some 855GM laptops. Closes: #439210 + + Xv window hidden for a little while no longer causes segfaults. + Closes: #457587 + + -- David Nusinow Mon, 07 Jan 2008 22:41:51 -0500 + +xserver-xorg-video-intel (2:2.2.0-2) UNRELEASED; urgency=low + + * Conflict with 915resolution. This driver now handles all of this itself + and better. Closes: #452803 + + -- David Nusinow Mon, 03 Dec 2007 21:35:07 -0500 + +xserver-xorg-video-intel (2:2.2.0-1) unstable; urgency=low + + * New upstream release. + + Also pull bugfix commit 4a2b0f340357c4ca58dc9586fad1337b83966362. + + Fix backlight problems on various chipsets, + closes: #443111, #438969, #439744. + + Fix some issues with high resolution, closes: #420840. + * Add myself to Uploaders and remove Branden with his permission. + + -- Brice Goglin Fri, 16 Nov 2007 09:30:26 +0100 + +xserver-xorg-video-intel (2:2.1.99-1) experimental; urgency=low + + [ David Nusinow ] + * Make -i810 arch: all again + + [ Julien Cristau ] + * New upstream release candidate + + fixes VT switch issues (closes: #431373, #436336) + + fixes memory allocation issues (closes: #423416) + + adds support for ch701x LVDS controllers (closes: #438650, #420350, + #424952) + + -- Julien Cristau Sun, 11 Nov 2007 11:16:03 +0100 + +xserver-xorg-video-intel (2:2.1.1-5) unstable; urgency=low + + * Use the same architectures for the -dbg and i810 packages as -intel. + This should allow it to transition to testing. Closes: #449228 + + -- David Nusinow Sun, 04 Nov 2007 09:10:31 -0500 + +xserver-xorg-video-intel (2:2.1.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 16:34:39 -0400 + +xserver-xorg-video-intel (2:2.1.1-3) experimental; urgency=low + + * Shorten the short description of the -dbg package a bit (thanks, Marc 'HE' + Brockschmidt). + * Rebuild for xserver 1.4. + + -- Julien Cristau Wed, 12 Sep 2007 11:21:49 +0200 + +xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Build against xserver 1.3.99.0. + + [ David Nusinow ] + * Add 01_gen_pci_ids.diff. This patch has the driver generate a list of pci + id's that it supports and installs it where the X server can find it. The + server with appropriate support will be able to automatically determine if + the intel driver is the proper driver to load when no driver is specified + in xorg.conf. + + -- Julien Cristau Sun, 19 Aug 2007 03:21:24 +0200 + +xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low + + * New upstream release. + + manpage typo fixed (closes: #432061). Thanks, A Costa! + + adds quirk for TV output on some 965-based laptops (closes: #434297). + + -- Julien Cristau Tue, 14 Aug 2007 12:48:02 +0200 + +xserver-xorg-video-intel (2:2.1.0-2) unstable; urgency=low + + [ Brice Goglin ] + * Fix XvMC support for only i810 and i815 in the long description. + * Build a xserver-xorg-video-intel-dbg package with debugging symbols. + + [ Julien Cristau ] + * Add upstream URL in the copyright file (thanks, Loïc Minier). + + -- Julien Cristau Mon, 09 Jul 2007 14:25:25 +0200 + +xserver-xorg-video-intel (2:2.1.0-1) unstable; urgency=low + + * New upstream release. + * Actually install the upstream README. + + -- Julien Cristau Tue, 03 Jul 2007 11:19:48 +0200 + +xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low + + * Update to latest upstream (commit 1e2e3013). + * Add myself to uploaders. + + -- Julien Cristau Mon, 02 Jul 2007 03:08:51 +0200 + +xserver-xorg-video-intel (2:2.0.0-5) experimental; urgency=low + + [ Drew Parsons ] + * The upstream README file looks interesting, include it with docs. + + [ Julien Cristau ] + * Pull in latest upstream git. + + -- Julien Cristau Fri, 22 Jun 2007 03:58:48 +0100 + +xserver-xorg-video-intel (2:2.0.0-4) experimental; urgency=low + + [ Julien Cristau ] + * Update watch file (s/i810/intel/). + + [ Drew Parsons ] + * Pull in latest upstream git (probably contains final Xv fix). + Closes: #417860. + + -- Drew Parsons Tue, 05 Jun 2007 18:35:50 +1000 + +xserver-xorg-video-intel (2:2.0.0-3) experimental; urgency=low + + * Pull in latest upstream git (updated Xv fix) + + -- Drew Parsons Wed, 30 May 2007 12:20:45 +1000 + +xserver-xorg-video-intel (2:2.0.0-2) experimental; urgency=low + + [ Julien Cristau ] + * Build xserver-xorg-video-i810 in binary-indep instead of binary-arch + (closes: #420240). Thanks, Aaron M. Ucko! + * Mention i965 chipsets in the long description. + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-i810. + + [ Drew Parsons ] + * Pull in latest upstream git + - Restores Xv video overlay. Closes: #417860, #420281 + * autoreconf + + -- Drew Parsons Sat, 26 May 2007 18:08:33 +1000 + +xserver-xorg-video-intel (2:2.0.0-1) unstable; urgency=low + + * New upstream release. + * Add XS-Vcs-*. + * Bump build-dep on xserver-xorg-dev to >= 2:1.3.0.0. + * Remove Fabio from Uploaders, with his permission. + * Install the bug script in the xserver-xorg-video-intel dir instead of + -i810. + * Install the upstream changelog. + * Upload to unstable. + + -- Julien Cristau Fri, 20 Apr 2007 08:54:20 +0200 + +xserver-xorg-video-intel (2:1.9.94-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Tue, 03 Apr 2007 11:36:43 +0200 + +xserver-xorg-video-intel (2:1.9.93-1) experimental; urgency=low + + * New upstream release candidate. + + bump build-dep on xserver-xorg-dev to >= 2:1.2.99.903. + + -- Julien Cristau Tue, 27 Mar 2007 08:25:39 +0200 + +xserver-xorg-video-intel (2:1.9.92-1) experimental; urgency=low + + * New upstream release candidate. + * Build-depend on xserver-xorg-dev 1.3rc2. + + -- Julien Cristau Thu, 15 Mar 2007 14:38:06 +0100 + +xserver-xorg-video-intel (2:1.9.91-2) experimental; urgency=low + + * Revert commit c2c62559e702e7de1fa2ef309fa647ab13564dc3 "Move + single mode setting code to X server." Brings i830PipeFindClosestMode + back into a consistent state. Closes: #414612. + * autoreconf and git-add Makefile.in files in ./src subdirectories. + + -- Drew Parsons Tue, 13 Mar 2007 22:49:18 +1100 + +xserver-xorg-video-intel (2:1.9.91-1) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2. Thanks, Marc 'HE' Brockschmidt! + * New upstream release candidate. + * Rename from -i810 to -intel to follow upstream naming. + * (Build-)Depend on a newer xserver. + + -- Julien Cristau Thu, 8 Mar 2007 18:55:05 +0100 + +xserver-xorg-video-i810 (2:1.7.4-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream version + * Generate Provides: line automatically + * Bump xserver-xorg-core build-depend to 2:1.2.0-6 to handle this properly + + [ Julien Cristau ] + * Drop duplicate build dependency on libdrm-dev, so this really + closes: #383918. + * Add support for the armeb and armel architectures, thanks to Riku Voipio + (closes: #408797). + * Drop all our patches, applied upstream. + * debian/rules clean needs to depend on xsfclean. + * Generate the dependency on xserver-xorg-core automatically. + + -- David Nusinow Sun, 4 Mar 2007 18:20:38 -0500 + +xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low + + [ Julien Cristau ] + * Don't build-dep on libdrm-dev on hurd-i386, and don't try to install + the libI810XvMC library there, as it isn't built without drm. Thanks to + Samuel Thibault for the patch! (closes: #383918) + + [ Drew Parsons ] + * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty + BIOSes (where VBE initialization failed). Closes: #382120. + + -- Drew Parsons Sat, 20 Jan 2007 02:29:30 +1100 + +xserver-xorg-video-i810 (2:1.7.2-3) unstable; urgency=low + + * Build-Depends: quilt, needed to apply patches. + * Replace the cvs source url in the long description with an XS-Vcs-Git + control field and a reference to the xf86-video-intel module. + Added a link to www.X.org. + + -- Drew Parsons Wed, 6 Dec 2006 12:52:18 +1100 + +xserver-xorg-video-i810 (2:1.7.2-2) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ Drew Parsons ] + * Apply upstream patch 1-overlay_fix_lockup.patch (git commit + e065324661ad08b3b359136f48090232f6138959, upstream bug #5774). + Should remove remaining lockup problems in I830WaitLpRing(). + Closes: #272294. + * While we're at it, apply upstream patch 11-xv_lockup.patch (git + commit fbb376bd1a4daad4c86e349df98438989ce173f1, upstream bug + #8594), fixing lockups related to Xv. We'll have no lockup bugs + in etch, dammit! Closes: #397485. + + -- Drew Parsons Wed, 6 Dec 2006 11:50:10 +1100 + +xserver-xorg-video-i810 (2:1.7.2-1) unstable; urgency=low + + * New upstream version + + Shipping the git log as part of our diff.gz rather than a separate patch + since upstream didn't include an updated Changelog + + -- David Nusinow Fri, 13 Oct 2006 14:33:20 -0400 + +xserver-xorg-video-i810 (2:1.6.5-4) UNRELEASED; urgency=low + + * Typo fix in man page. Closes: #364559. + + -- Drew Parsons Thu, 21 Sep 2006 23:21:14 +1000 + +xserver-xorg-video-i810 (2:1.6.5-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + [ Drew Parsons ] + * Standards version 3.7.2. + * Use debhelper 5. + * Use dh_installman to install man pages. + * Exclude .la from dh_install. + + -- David Nusinow Mon, 18 Sep 2006 19:57:38 -0400 + +xserver-xorg-video-i810 (2:1.6.5-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:32 +0000 + +xserver-xorg-video-i810 (2:1.6.5-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Thu, 10 Aug 2006 22:53:34 +0000 + +xserver-xorg-video-i810 (2:1.6.4-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Wed, 9 Aug 2006 22:37:24 +0000 + +xserver-xorg-video-i810 (2:1.6.3-1) experimental; urgency=low + + * New upstream release + * Add x11proto-xinerama-dev to build-dep + + -- David Nusinow Tue, 8 Aug 2006 22:01:43 +0000 + +xserver-xorg-video-i810 (2:1.6.1-2) experimental; urgency=low + + * Fix for botched upload. Identical to -1, which I built wrong. + + -- David Nusinow Sun, 6 Aug 2006 18:37:45 +0000 + +xserver-xorg-video-i810 (2:1.6.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream version + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 17:29:12 +0000 + +xserver-xorg-video-i810 (2:1.4.1.3-1) unstable; urgency=low + + * Roll back the version to what was released with 7.0. Stupid ABI + incompatibilities. (closes: #359328) + * Add call to dh_makeshlibs. Reorder dh_installdeb and dh_shlibdeps so that + ldconfig is called during postinst. Thanks Justin Pryzby and Steve + Langasek. (closes: #364012) + + -- David Nusinow Sat, 22 Apr 2006 18:21:51 -0400 + +xserver-xorg-video-i810 (1:1.5.1.0-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:40 -0500 + +xserver-xorg-video-i810 (1:1.5.1.0-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Tue, 21 Mar 2006 22:40:04 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-3) experimental; urgency=low + + * Version build dependency on libxvmc-dev. Thanks John Hughes. + (closes: #358165) + + -- David Nusinow Tue, 21 Mar 2006 20:49:27 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-2) experimental; urgency=low + + * Don't build on sparc. Partial port of + sparc/103_sparc_dont_build_useless_drivers.diff. + + -- David Nusinow Sun, 5 Mar 2006 20:32:01 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:37:39 -0500 + +xserver-xorg-driver-i810 (1:1.4.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 19:57:22 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:06:03 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Bump Build-Depends on libdrm-dev to >> 2.0. + + -- Daniel Stone Mon, 12 Dec 2005 13:20:11 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, libdrm (>> 1.0.5), + x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:54:24 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:30:52 +1100 + +xserver-xorg-driver-i810 (1:1.4.0.1-1) dapper; urgency=low + + * New upstream version. + + -- Daniel Stone Thu, 20 Oct 2005 13:37:40 +1000 + +xserver-xorg-driver-i810 (1:1.4.0-1) breezy; urgency=low + + * First xserver-xorg-driver-i810 release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-intel-2.21.14.orig/debian/copyright +++ xserver-xorg-video-intel-2.21.14/debian/copyright @@ -0,0 +1,403 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +This copyright file is based on xf86-video-intel 2.3.1. + +The files under src/modes/ and src/parser/ are stolen from the xorg-server +source. + +The authors of this core are, see below for copyright declarations. + +* Alan Hourihane / +* Bob Paauwe +* Dave Airlie +* Dave Mueller +* David Dawes +* Eric Anholt +* Jens Owen +* Jesse Barnes +* Jonathan Bian +* Keith Packard +* Keith Whitwell +* Kevin E. Martin / +* Kristian Høgsberg +* Luc Verhaegen +* Matt Sottek +* Rickard E. (Rik) Faith +* Thomas Hellstrom +* Wang Zhenyu +* Xiang Haihao + +==== + +Most of the code is covered by the MIT/X11 license: + +- +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +- + +The copyright holders are: + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas: +src/i810_accel.c +src/i810_wmark.c +src/i810_reg.h +src/i810_driver.c +src/i810_memory.c +src/i810_io.c +src/i810_cursor.c +src/i830_accel.c +src/i830_xaa.c +src/i830_exa.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2000 VA Linux Systems, Inc. +src/xvmc/xf86dri.h +src/xvmc/xf86dri.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2002 David Dawes +src/i830_memory.c +src/i830.h +src/i830_ring.h +src/i830_cursor.c +src/i810_ring.h +src/i810.h +src/common.h +src/xvmc/xf86dristr.h + +* Copyright 2000 Intel Corporation. All Rights Reserved: +src/i810_hwmc.c +src/i830_video.h +src/i810_video.c +src/i830_video.c + +* Copyright 2001 Intel Corporation. All Rights Reserved. +src/xvmc/I810XvMC.h +src/xvmc/I810XvMC.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 by David Dawes +src/i830_dri.c +src/i830_driver.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas. +src/i830_common.h + +* Copyright 2002 David Dawes +* Copyright 2006 Intel Corporation +src/i830_modes.c + +* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i810_common.h + +* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i830_reg.h +src/i830_3d.c +src/i915_3d.c +src/i915_reg.h +src/xvmc/intel_batchbuffer.c + +* Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas. +src/brw_structs.h +src/brw_defines.h + +* Copyright 2005 Red Hat, Inc. +src/i830_io.c + +* Copyright 2005 Adam Jackson: +src/Makefile.am + +* Copyright (c) 2005 Jesse Barnes +src/i830_exa.c + +* Copyright 2005 Thomas Hellstrom. All rights reserved. +src/xvmc/driDrawable.c +src/xvmc/driDrawable.h + +* Copyright 2005-2006 Luc Verhaegen. +src/modes/xf86cvt.c + +* Copyright 2006 Luc Verhaegen. +src/modes/xf86EdidModes.c + +* Copyright 2006 Dave Airlie +src/i830_i2c.c +src/i830_sdvo.c +src/i830_dvo.c +src/sil164/sil164.c +src/sil164/sil164.h +src/sil164/sil164_reg.h +src/ch7xxx/ch7xxx_reg.h +src/ch7xxx/ch7xxx.c +src/ch7xxx/ch7xxx.h + +* Copyright 2006 Intel Corporation: +src/xvmc/i915_xvmc.c +src/xvmc/i915_xvmc.h +src/xvmc/i915_structs.h +src/i915_hwmc.h +src/i915_hwmc.c +src/i915_video.c +src/i915_render.c +src/i915_3d.h +src/exa_wm.g4i +src/exa_wm_src_sample_argb.g4a +src/exa_wm_mask_affine.g4a +src/exa_wm_projective.g4i +src/exa_sf.g4a +src/exa_wm_affine.g4i +src/exa_wm_mask_sample_a.g4a +src/exa_sf_mask.g4a +src/exa_wm_write.g4a +src/exa_wm_mask_sample_argb.g4a +src/exa_wm_ca.g4a +src/exa_wm_src_affine.g4a +src/exa_wm_xy.g4a +src/exa_wm_noca.g4a +src/exa_wm_ca_srcalpha.g4a +src/exa_wm_mask_projective.g4a +src/exa_wm_src_sample_a.g4a +src/exa_wm_src_projective.g4a +src/i830_lvds.c +src/i830_sdvo.h +src/i830_bios.c +src/i830_bios.h +src/i830_debug.c +src/i830_crt.c +src/i830_display.c +src/i830_sdvo_regs.h +src/i830_render.c +src/i830_tv.c +src/i830_display.h +src/i830_debug.h +src/packed_yuv_sf.g4a +src/packed_yuv_wm.g4a +src/i965_video.c +src/i965_render.c +src/ch7017/ch7017.c +src/ch7017/ch7017_reg.h +src/sil164/Makefile.am +src/modes/xf86Modes.h +src/ivch/ivch.c +src/ivch/ivch_reg.h +src/ivch/ivch_module.c + +* Copyright 2007 Intel Corporation: +src/bios_reader/bios_dumper.c +src/bios_reader/bios_reader.c +src/i830_hwmc.h +src/i830_hwmc.c +src/i830_quirks.c +src/xvmc/intel_xvmc.c +src/xvmc/intel_xvmc.h + +* Copyright 2007 Dave Mueller +src/tfp410/tfp410.c +src/tfp410/tfp410.h +src/tfp410/tfp410_reg.h + +==== + +src/i810_dga.c is Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK +and covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Alan Hourihane not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Alan Hourihane makes no representations + * about the suitability of this software for any purpose. It is provided + * "as is" without express or implied warranty. + * + * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. +- + +==== +A few files a covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. +- + +The copyright holders are: + +* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc. +src/modes/xf86RandR12.c + +* Copyright 2006 Keith Packard +src/modes/xf86Crtc.c +src/modes/xf86RandR12.h +src/modes/xf86Rename.h +src/local_xf86Rename.h +src/modes/xf86DiDGA.c +src/modes/xf86Rotate.c +src/modes/xf86Crtc.h + +* Copyright 2006 Eric Anholt +src/i2c_vid.h + +* Copyright 2007 Keith Packard +src/modes/xf86Cursors.c + +==== + +src/parser/xf86Parser.h and src/parser/xf86Optrec.h are covered by a license +similar to the MIT/X11 license, but with an additional advertising clause: + +* Copyright (c) 1997 Metro Link Incorporated +* Copyright (c) 1997-2003 by The XFree86 Project, Inc. +* Copyright (c) 1997-2001 by The XFree86 Project, Inc. + +- + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Except as contained in this notice, the name of the Metro Link shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from Metro Link. +- + +==== + +src/modes/xf86Modes.c is covered by a license similar to the MIT/X11 license, +but with an additional advertising clause: + +- + * Copyright (c) 1997-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ +- + +==== + +All files generated by the buildsystem toolchain (e.g. autogen.sh) remain +under the copyright of their authors from the respective tools. + +==== + + +A couple of files are without explicit copyright: + +Some tiny Makefile.am: +src/xvmc/Makefile.am +src/ch7017/Makefile.am +src/tfp410/Makefile.am +src/ivch/Makefile.am +src/ch7xxx/Makefile.am + + +src/exa_wm_write.g4b +src/exa_sf.g4b +src/exa_wm_xy.g4b +src/packed_yuv_sf.g4b +src/exa_wm_src_sample_argb.g4b +src/exa_sf_mask.g4b +src/exa_wm_src_sample_a.g4b +src/exa_wm_src_affine.g4b +src/packed_yuv_wm.g4b +src/exa_wm_mask_sample_argb.g4b +src/exa_wm_ca.g4b +src/exa_wm_mask_affine.g4b +src/exa_wm_ca_srcalpha.g4b +src/exa_wm_nomask.g4a +src/exa_wm_mask_projective.g4b +src/exa_wm_noca.g4b +src/exa_wm_mask_sample_a.g4b +src/exa_wm_src_projective.g4b + + +src/tfp410/tfp410_module.c +src/ch7xxx/ch7xxx_module.c +src/ch7017/ch7017_module.c +src/xvmc/i915_program.h +src/xvmc/intel_batchbuffer.h +src/scripts/clock-graph.5c +src/scripts/clock.5c +src/scripts/fix.5c +src/scripts/tv.5c +src/sil164/sil164_module.c +src/i810_dri.h +src/i810_dri.c +src/i830_dri.h --- xserver-xorg-video-intel-2.21.14.orig/debian/README.source +++ xserver-xorg-video-intel-2.21.14/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-video-intel-2.21.14.orig/debian/compat +++ xserver-xorg-video-intel-2.21.14/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-intel-2.21.14.orig/debian/control +++ xserver-xorg-video-intel-2.21.14/debian/control @@ -0,0 +1,79 @@ +Source: xserver-xorg-video-intel +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, +# Depend on latest server to ensure XMir support + xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-xinerama-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + x11proto-video-dev, + libx11-dev, + libdrm-dev (>= 2.4.23), + x11proto-xf86dri-dev, + x11proto-gl-dev, + libgl1-mesa-dev | libgl-dev, + libpciaccess-dev (>= 0.8.0+git20071002), +# following are only needed for xvmc: + x11proto-dri2-dev, + libxvmc-dev (>= 1:1.0.1), + libxext-dev, + libxfixes-dev, + libx11-xcb-dev, + libxcb-util0-dev, + libxcb-dri2-0-dev, +# end xvmc + libudev-dev [linux-any], + dpkg-dev (>= 1.14.17), + quilt (>= 0.46-7~), + xutils-dev (>= 1:7.5+4), + valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x], +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git + +Package: xserver-xorg-video-intel +Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- Intel i8xx, i9xx display driver + This package provides the driver for the Intel i8xx and i9xx family + of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945 + and i965 series chips. + . + This package also provides XvMC (XVideo Motion Compensation) drivers + for i810/i815 and i9xx and newer chipsets. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-intel driver module. + +Package: xserver-xorg-video-intel-dbg +Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 +Depends: + xserver-xorg-video-intel (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Recommends: + intel-gpu-tools, +Section: debug +Priority: extra +Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) + This driver provides support for the Intel i8xx and i9xx family of chipsets, + including i810, i815, i830, i845, i855, i865, i915, and i945 series chips. + . + This package provides debugging symbols for this Xorg X driver. --- xserver-xorg-video-intel-2.21.14.orig/debian/xserver-xorg-video-intel.lintian-overrides +++ xserver-xorg-video-intel-2.21.14/debian/xserver-xorg-video-intel.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libI810XvMC1 libIntelXvMC1 --- xserver-xorg-video-intel-2.21.14.orig/debian/xserver-xorg-video-intel.links +++ xserver-xorg-video-intel-2.21.14/debian/xserver-xorg-video-intel.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-intel/script --- xserver-xorg-video-intel-2.21.14.orig/debian/README.Debian +++ xserver-xorg-video-intel-2.21.14/debian/README.Debian @@ -0,0 +1,13 @@ +xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low + + * Starting from 2.10, the Intel X driver depends on a kernel driver for + mode setting (that's called KMS). The corresponding kernel option is + CONFIG_DRM_I915, and is enabled in Debian kernels. + * To enable KMS, either of those should be sufficient: + + /etc/modprobe.d/i915-kms.conf should contain: + options i915 modeset=1 + + CONFIG_DRM_I915_KMS=y should be set in the kernel config. + * If you have issues with this driver, the "vesa" or "fbdev" drivers + may be useful fallbacks. + + -- Cyril Brulebois Sun, 07 Nov 2010 19:51:56 +0100 --- xserver-xorg-video-intel-2.21.14.orig/debian/xserver-xorg-video-intel.install +++ xserver-xorg-video-intel-2.21.14/debian/xserver-xorg-video-intel.install @@ -0,0 +1,4 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/man --- xserver-xorg-video-intel-2.21.14.orig/debian/xserver-xorg-video-intel.docs +++ xserver-xorg-video-intel-2.21.14/debian/xserver-xorg-video-intel.docs @@ -0,0 +1,2 @@ +NEWS +README --- xserver-xorg-video-intel-2.21.14.orig/debian/patches/series +++ xserver-xorg-video-intel-2.21.14/debian/patches/series @@ -0,0 +1,4 @@ +Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch +Link-the-driver-against-pixman.patch +0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch +xmir.patch --- xserver-xorg-video-intel-2.21.14.orig/debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch +++ xserver-xorg-video-intel-2.21.14/debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch @@ -0,0 +1,60 @@ +From 5d29daa7df72d9a96e044d0706f3014811389629 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 14 Aug 2013 18:16:22 +0100 +Subject: [PATCH] sna: Make sure the frontbuffer exists before doing pitch + checks + +An unusual path to be sure, to call sna_crtc_set_mode_major before we +create a GPU bo for the scanout - but might be possible after a GPU +hang, or it appears after trying to set a 0x0 mode. At any rate, make +sure the GPU bo exists before dereferencing. + +Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/1212344 +Signed-off-by: Chris Wilson +--- + src/sna/sna_display.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c +index 2a5b4b4..a6a4665 100644 +--- a/src/sna/sna_display.c ++++ b/src/sna/sna_display.c +@@ -1093,7 +1093,7 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc) + PictTransform crtc_to_fb; + struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc; + unsigned long pitch_limit; +- struct kgem_bo *bo; ++ struct sna_pixmap *priv; + BoxRec b; + + assert(sna->scrn->virtualX && sna->scrn->virtualY); +@@ -1118,18 +1118,21 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc) + return true; + } + +- bo = sna_pixmap_get_bo(sna->front); ++ priv = sna_pixmap_force_to_gpu(sna->front, MOVE_READ | MOVE_WRITE); ++ if (priv == NULL) ++ return true; /* maybe we can create a bo for the scanout? */ ++ + if (sna->kgem.gen == 071) +- pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024; ++ pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024; + else if ((sna->kgem.gen >> 3) > 4) + pitch_limit = 32 * 1024; + else if ((sna->kgem.gen >> 3) == 4) +- pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024; ++ pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024; + else if ((sna->kgem.gen >> 3) == 3) +- pitch_limit = bo->tiling ? 8 * 1024 : 16 * 1024; ++ pitch_limit = priv->gpu_bo->tiling ? 8 * 1024 : 16 * 1024; + else + pitch_limit = 8 * 1024; +- if (bo->pitch > pitch_limit) ++ if (priv->gpu_bo->pitch > pitch_limit) + return true; + + transform = NULL; +-- +1.8.3.4 + --- xserver-xorg-video-intel-2.21.14.orig/debian/patches/xmir.patch +++ xserver-xorg-video-intel-2.21.14/debian/patches/xmir.patch @@ -0,0 +1,769 @@ +commit b6b5c3f009585151eb772dfc2526843c7cee82b3 +Author: Chris Wilson +Date: Fri Aug 9 11:34:39 2013 +0100 + + intel: Disable incompatible features whilst hosted + + Start adding the infrastructure to disable direct hardware access if X + is being run under a system compositor (aka "hosted"). + + Signed-off-by: Chris Wilson + +diff --git a/src/intel_device.c b/src/intel_device.c +index c5f0a38..d9ff8bc 100644 +--- a/src/intel_device.c ++++ b/src/intel_device.c +@@ -92,7 +92,7 @@ static int __intel_check_device(int fd) + if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) + ret = FALSE; + } +- if (ret) { ++ if (ret && !hosted()) { + struct drm_mode_card_res res; + + memset(&res, 0, sizeof(res)); +@@ -199,6 +199,12 @@ int intel_open_device(int entity_num, + dev->open_count = 0; + dev->master_count = 0; + ++ /* If hosted under a system compositor, just pretend to be master */ ++ if (hosted()) { ++ dev->open_count++; ++ dev->master_count++; ++ } ++ + xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = dev; + + return fd; +@@ -222,6 +228,8 @@ int intel_get_device(ScrnInfoPtr scrn) + drmSetVersion sv; + int retry = 2000; + ++ assert(!hosted()); ++ + /* Check that what we opened was a master or a + * master-capable FD, by setting the version of the + * interface we'll use to talk to it. +@@ -267,6 +275,7 @@ int intel_get_master(ScrnInfoPtr scrn) + if (dev->master_count++ == 0) { + int retry = 2000; + ++ assert(!hosted()); + do { + ret = drmSetMaster(dev->fd); + if (ret == 0) +@@ -288,6 +297,7 @@ int intel_put_master(ScrnInfoPtr scrn) + ret = 0; + assert(dev->master_count); + if (--dev->master_count == 0) { ++ assert(!hosted()); + assert(drmSetMaster(dev->fd) == 0); + ret = drmDropMaster(dev->fd); + } +@@ -317,6 +327,7 @@ void intel_put_device(ScrnInfoPtr scrn) + if (--dev->open_count) + return; + ++ assert(!hosted()); + intel_set_device(scrn, NULL); + + drmClose(dev->fd); +diff --git a/src/intel_driver.h b/src/intel_driver.h +index 1e67eab..4768536 100644 +--- a/src/intel_driver.h ++++ b/src/intel_driver.h +@@ -129,4 +129,6 @@ void intel_put_device(ScrnInfoPtr scrn); + + void __intel_uxa_release_device(ScrnInfoPtr scrn); + ++#define hosted() (0) ++ + #endif /* INTEL_DRIVER_H */ +diff --git a/src/intel_module.c b/src/intel_module.c +index 47e494c..42fa8d8 100644 +--- a/src/intel_module.c ++++ b/src/intel_module.c +@@ -382,6 +382,9 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn, + #else + (*flag) = HW_IO | HW_MMIO; + #endif ++ if (hosted()) ++ (*flag) = HW_SKIP_CONSOLE; ++ + return TRUE; + default: + /* Unknown or deprecated function */ +@@ -410,6 +413,9 @@ static enum accel_method { UXA, SNA } get_accel_method(void) + enum accel_method accel_method = DEFAULT_ACCEL_METHOD; + XF86ConfDevicePtr dev; + ++ if (hosted()) ++ return SNA; ++ + dev = _xf86findDriver("intel", xf86configptr->conf_device_lst); + if (dev && dev->dev_option_lst) { + const char *s; +@@ -493,7 +499,8 @@ static Bool intel_pci_probe(DriverPtr driver, + case PCI_CHIP_I810_DC100: + case PCI_CHIP_I810_E: + case PCI_CHIP_I815: +- break; ++ if (!hosted()) ++ break; + default: + return FALSE; + } +diff --git a/src/sna/sna.h b/src/sna/sna.h +index caf671f..7387088 100644 +--- a/src/sna/sna.h ++++ b/src/sna/sna.h +@@ -229,6 +229,7 @@ struct sna { + #define SNA_TEAR_FREE 0x10 + #define SNA_FORCE_SHADOW 0x20 + #define SNA_FLUSH_GTT 0x40 ++#define SNA_IS_HOSTED 0x80 + #define SNA_REPROBE 0x80000000 + + unsigned cpu_features; +diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c +index 5dcf47f..f86d93d 100644 +--- a/src/sna/sna_display.c ++++ b/src/sna/sna_display.c +@@ -3151,11 +3151,22 @@ sna_crtc_config_notify(ScreenPtr screen) + sna_mode_update(to_sna_from_screen(screen)); + } + ++#if HAS_PIXMAP_SHARING ++#define sna_setup_provider(scrn) xf86ProviderSetup(scrn, NULL, "Intel") ++#else ++#define sna_setup_provider(scrn) ++#endif ++ + bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna) + { + struct sna_mode *mode = &sna->mode; + int i; + ++ if (sna->flags & SNA_IS_HOSTED) { ++ sna_setup_provider(scrn); ++ return true; ++ } ++ + mode->kmode = drmModeGetResources(sna->kgem.fd); + if (mode->kmode) { + xf86CrtcConfigInit(scrn, &sna_mode_funcs); +@@ -3172,9 +3183,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna) + if (!xf86IsEntityShared(scrn->entityList[0])) + sna_mode_compute_possible_clones(scrn); + +-#if HAS_PIXMAP_SHARING +- xf86ProviderSetup(scrn, NULL, "Intel"); +-#endif ++ sna_setup_provider(scrn); + } else { + if (!sna_mode_fake_init(sna)) + return false; +@@ -3200,6 +3209,9 @@ sna_mode_close(struct sna *sna) + while (sna_mode_has_pending_events(sna)) + sna_mode_wakeup(sna); + ++ if (sna->flags & SNA_IS_HOSTED) ++ return; ++ + for (i = 0; i < xf86_config->num_crtc; i++) + sna_crtc_disable_shadow(sna, to_sna_crtc(xf86_config->crtc[i])); + } +diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c +index fc8773b..7f2c0ac 100644 +--- a/src/sna/sna_driver.c ++++ b/src/sna/sna_driver.c +@@ -287,7 +287,7 @@ static bool has_pageflipping(struct sna *sna) + drm_i915_getparam_t gp; + int v; + +- if (sna->flags & SNA_NO_WAIT) ++ if (sna->flags & (SNA_IS_HOSTED | SNA_NO_WAIT)) + return false; + + v = 0; +@@ -413,6 +413,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + sna = to_sna(scrn); + sna->scrn = scrn; + sna->pEnt = pEnt; ++ sna->flags = 0; + + scrn->displayWidth = 640; /* default it */ + +@@ -425,7 +426,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + fd = intel_get_device(scrn); + if (fd == -1) { + xf86DrvMsg(scrn->scrnIndex, X_ERROR, +- "Failed to become DRM master.\n"); ++ "Failed to claim DRM device.\n"); + goto cleanup; + } + +@@ -484,7 +485,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE)) + sna->tiling &= ~SNA_TILING_FB; + +- sna->flags = 0; + if (!xf86ReturnOptValBool(sna->Options, OPTION_SWAPBUFFERS_WAIT, TRUE)) + sna->flags |= SNA_NO_WAIT; + if (xf86ReturnOptValBool(sna->Options, OPTION_TRIPLE_BUFFER, TRUE)) +@@ -629,6 +629,9 @@ sna_uevent_init(ScrnInfoPtr scrn) + Bool hotplug; + MessageType from = X_CONFIG; + ++ if (sna->flags & SNA_IS_HOSTED) ++ return; ++ + DBG(("%s\n", __FUNCTION__)); + + /* RandR will be disabled if Xinerama is active, and so generating +@@ -895,7 +898,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL) + if (!miDCInitialize(screen, xf86GetPointerScreenFuncs())) + return FALSE; + +- if (xf86_cursors_init(screen, SNA_CURSOR_X, SNA_CURSOR_Y, ++ if ((sna->flags & SNA_IS_HOSTED) == 0 && ++ xf86_cursors_init(screen, SNA_CURSOR_X, SNA_CURSOR_Y, + HARDWARE_CURSOR_TRUECOLOR_AT_8BPP | + HARDWARE_CURSOR_BIT_ORDER_MSBFIRST | + HARDWARE_CURSOR_INVERT_MASK | +diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c +index a0b4db9..a68a173 100644 +--- a/src/sna/sna_video_overlay.c ++++ b/src/sna/sna_video_overlay.c +@@ -683,6 +683,9 @@ void sna_video_overlay_setup(struct sna *sna, ScreenPtr screen) + struct sna_video *video; + XvPortPtr port; + ++ if (sna->flags & SNA_IS_HOSTED) ++ return; ++ + if (!sna_has_overlay(sna)) + return; + +diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c +index 07e59bd..a8d50ab 100644 +--- a/src/sna/sna_video_sprite.c ++++ b/src/sna/sna_video_sprite.c +@@ -456,6 +456,9 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) + struct sna_video *video; + XvPortPtr port; + ++ if (sna->flags & SNA_IS_HOSTED) ++ return; ++ + memset(&r, 0, sizeof(struct drm_mode_get_plane_res)); + if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPLANERESOURCES, &r)) + return; +commit 3d818c0a36919add462c05d01a64b297f693fa69 +Author: Chris Wilson +Date: Wed Aug 14 08:34:46 2013 +0100 + + sna: unwrap old modesetting API whilst hosted + + If we are hosted, then we do not have our own modesetting backend and + calling it results in fireworks. So leave the old modesetting entry + points for the hosting midlayer to control. + + Signed-off-by: Chris Wilson + +diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c +index 7f2c0ac..c27deb6 100644 +--- a/src/sna/sna_driver.c ++++ b/src/sna/sna_driver.c +@@ -1080,6 +1080,15 @@ static Bool sna_pm_event(SCRN_ARG_TYPE arg, pmEvent event, Bool undo) + return TRUE; + } + ++static Bool sna_enter_vt__hosted(VT_FUNC_ARGS_DECL) ++{ ++ return TRUE; ++} ++ ++static void sna_leave_vt__hosted(VT_FUNC_ARGS_DECL) ++{ ++} ++ + Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num) + { + DBG(("%s: entity_num=%d\n", __FUNCTION__, entity_num)); +@@ -1110,13 +1119,18 @@ Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num) + + scrn->PreInit = sna_pre_init; + scrn->ScreenInit = sna_screen_init; +- scrn->SwitchMode = sna_switch_mode; +- scrn->AdjustFrame = sna_adjust_frame; +- scrn->EnterVT = sna_enter_vt; +- scrn->LeaveVT = sna_leave_vt; ++ if (!hosted()) { ++ scrn->SwitchMode = sna_switch_mode; ++ scrn->AdjustFrame = sna_adjust_frame; ++ scrn->EnterVT = sna_enter_vt; ++ scrn->LeaveVT = sna_leave_vt; ++ scrn->ValidMode = sna_valid_mode; ++ scrn->PMEvent = sna_pm_event; ++ } else { ++ scrn->EnterVT = sna_enter_vt__hosted; ++ scrn->LeaveVT = sna_leave_vt__hosted; ++ } + scrn->FreeScreen = sna_free_screen; +- scrn->ValidMode = sna_valid_mode; +- scrn->PMEvent = sna_pm_event; + + xf86SetEntitySharable(entity_num); + xf86SetEntityInstanceForScreen(scrn, entity_num, +commit 394978867edf3746c285491db6be41abfe325d87 +Author: Chris Wilson +Date: Wed Aug 14 08:38:52 2013 +0100 + + sna: Check that we successfully install the required hosting midlayer + + Signed-off-by: Chris Wilson + +diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c +index c27deb6..83a5bba 100644 +--- a/src/sna/sna_driver.c ++++ b/src/sna/sna_driver.c +@@ -430,6 +430,13 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + goto cleanup; + } + ++ /* Sanity check */ ++ if (hosted() && (sna->flags & SNA_IS_HOSTED) == 0) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Failed to setup hosted device.\n"); ++ goto cleanup; ++ } ++ + preferred_depth = sna->info->gen < 030 ? 15 : 24; + if (!fb_supports_depth(fd, preferred_depth)) + preferred_depth = 24; +commit 96e2b3c6ee7aad96612a2efad97656a764e197f4 +Author: Chris Wilson +Date: Wed Jul 24 01:44:30 2013 +0100 + + sna: Preliminary patch for XMir + + For the intrepid explorer, who is desperate to encounter all the bugs we + fixed long ago. /o\ + + Signed-off-by: Chris Wilson + +diff --git a/src/Makefile.am b/src/Makefile.am +index b0781ca..126bde2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -59,6 +59,7 @@ intel_drv_la_SOURCES = \ + intel_driver.h \ + intel_options.c \ + intel_module.c \ ++ intel_xmir.h \ + compat-api.h \ + $(NULL) + +diff --git a/src/intel_device.c b/src/intel_device.c +index d9ff8bc..706b156 100644 +--- a/src/intel_device.c ++++ b/src/intel_device.c +@@ -121,10 +121,34 @@ static int fd_set_cloexec(int fd) + return fd; + } + ++static int __intel_open_xmir(const struct pci_device *pci, ++ char **path) ++{ ++ char id[20]; ++ int fd; ++ ++ snprintf(id, sizeof(id), ++ "pci:%04x:%02x:%02x.%d", ++ pci->domain, pci->bus, pci->dev, pci->func); ++ fd = xmir_get_drm_fd(id); ++ if (fd == -1) ++ return -1; ++ ++ if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */ ++ *path = drmGetDeviceNameFromFd(fd); ++ if (*path == NULL) ++ fd = -1; ++ ++ return fd; ++} ++ + static int __intel_open_device(const struct pci_device *pci, char **path) + { + int fd; + ++ if (xorgMir) ++ return __intel_open_xmir(pci, path); ++ + if (*path == NULL) { + char id[20]; + int ret; +diff --git a/src/intel_driver.h b/src/intel_driver.h +index 4768536..d5caa4f 100644 +--- a/src/intel_driver.h ++++ b/src/intel_driver.h +@@ -1,6 +1,8 @@ + #ifndef INTEL_DRIVER_H + #define INTEL_DRIVER_H + ++#include "intel_xmir.h" ++ + #define INTEL_VERSION 4000 + #define INTEL_NAME "intel" + #define INTEL_DRIVER_NAME "intel" +@@ -129,6 +131,6 @@ void intel_put_device(ScrnInfoPtr scrn); + + void __intel_uxa_release_device(ScrnInfoPtr scrn); + +-#define hosted() (0) ++#define hosted() (xorgMir) + + #endif /* INTEL_DRIVER_H */ +diff --git a/src/intel_xmir.h b/src/intel_xmir.h +new file mode 100644 +index 0000000..2e3c85a +--- /dev/null ++++ b/src/intel_xmir.h +@@ -0,0 +1,15 @@ ++#ifndef INTEL_XMIR_H ++#define INTEL_XMIR_H ++ ++#include ++ ++#if XMIR ++#include ++#include ++#else ++typedef struct xmir_screen xmir_screen; ++#define xorgMir 0 ++#define xmir_get_drm_fd(id) -1 ++#endif ++ ++#endif /* INTEL_XMIR_H */ +diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am +index 5d5417e..1c5dda0 100644 +--- a/src/sna/Makefile.am ++++ b/src/sna/Makefile.am +@@ -75,6 +75,7 @@ libsna_la_SOURCES = \ + sna_video_overlay.c \ + sna_video_sprite.c \ + sna_video_textured.c \ ++ sna_xmir.c \ + gen2_render.c \ + gen2_render.h \ + gen3_render.c \ +diff --git a/src/sna/sna.h b/src/sna/sna.h +index fe84074..d9ebd75 100644 +--- a/src/sna/sna.h ++++ b/src/sna/sna.h +@@ -283,6 +283,7 @@ struct sna { + EntityInfoPtr pEnt; + struct pci_device *PciInfo; + const struct intel_device_info *info; ++ xmir_screen *xmir; + + ScreenBlockHandlerProcPtr BlockHandler; + ScreenWakeupHandlerProcPtr WakeupHandler; +@@ -420,6 +421,17 @@ CARD32 sna_render_format_for_depth(int depth); + + void sna_debug_flush(struct sna *sna); + ++static inline void ++get_window_deltas(PixmapPtr pixmap, int16_t *x, int16_t *y) ++{ ++#ifdef COMPOSITE ++ *x = -pixmap->screen_x; ++ *y = -pixmap->screen_y; ++#else ++ *x = *y = 0; ++#endif ++} ++ + static inline bool + get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap, int16_t *x, int16_t *y) + { +@@ -930,4 +942,18 @@ void sna_image_composite(pixman_op_t op, + uint16_t width, + uint16_t height); + ++/* sna_xmir.c */ ++ ++#if XMIR ++bool sna_xmir_create(struct sna *sna); ++bool sna_xmir_pre_init(struct sna *sna); ++void sna_xmir_init(struct sna *sna, ScreenPtr screen); ++void sna_xmir_post_damage(struct sna *sna); ++#else ++inline static bool sna_xmir_create(struct sna *sna) { return true; } ++inline static bool sna_xmir_pre_init(struct sna *sna) { return true; } ++inline static void sna_xmir_init(struct sna *sna, ScreenPtr screen) { } ++inline static void sna_xmir_post_damage(struct sna *sna) { } ++#endif ++ + #endif /* _SNA_H */ +diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c +index 1569251..d0db3de 100644 +--- a/src/sna/sna_dri.c ++++ b/src/sna/sna_dri.c +@@ -2272,6 +2272,13 @@ out_complete: + } + #endif + ++#if DRI2INFOREC_VERSION >= 8 && XMIR ++static int sna_dri_auth_magic2(ScreenPtr screen, uint32_t magic) ++{ ++ return xmir_auth_drm_magic(to_sna_from_screen(screen)->xmir, magic); ++} ++#endif ++ + static bool has_i830_dri(void) + { + return access(DRI_DRIVER_PATH "/i830_dri.so", R_OK) == 0; +@@ -2347,6 +2354,13 @@ bool sna_dri_open(struct sna *sna, ScreenPtr screen) + info.ReuseBufferNotify = NULL; + #endif + ++#if DRI2INFOREC_VERSION >= 8 && XMIR ++ if (sna->xmir) { ++ info.version = 8; ++ info.AuthMagic2 = sna_dri_auth_magic2; ++ } ++#endif ++ + #if USE_ASYNC_SWAP + info.version = 10; + info.AsyncSwap = sna_dri_async_swap; +diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c +index 83a5bba..6fe49c9 100644 +--- a/src/sna/sna_driver.c ++++ b/src/sna/sna_driver.c +@@ -430,6 +430,9 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + goto cleanup; + } + ++ if (!sna_xmir_create(sna)) ++ return FALSE; ++ + /* Sanity check */ + if (hosted() && (sna->flags & SNA_IS_HOSTED) == 0) { + xf86DrvMsg(scrn->scrnIndex, X_ERROR, +@@ -437,9 +440,14 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + goto cleanup; + } + +- preferred_depth = sna->info->gen < 030 ? 15 : 24; +- if (!fb_supports_depth(fd, preferred_depth)) ++ if (sna->xmir) { ++ /* XXX query depth from xmir */ + preferred_depth = 24; ++ } else { ++ preferred_depth = sna->info->gen < 030 ? 15 : 24; ++ if (!fb_supports_depth(fd, preferred_depth)) ++ preferred_depth = 24; ++ } + + if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0, + Support32bppFb | +@@ -475,6 +483,9 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) + + intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo); + ++ if (!sna_xmir_pre_init(sna)) ++ return FALSE; ++ + kgem_init(&sna->kgem, fd, sna->PciInfo, sna->info->gen); + if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE) || + !sna_option_cast_to_bool(sna, OPTION_ACCEL_METHOD, TRUE)) { +@@ -558,6 +569,8 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL) + + if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec)) + sna_accel_block_handler(sna, tv); ++ ++ sna_xmir_post_damage(sna); + } + + static void +@@ -898,6 +911,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL) + return FALSE; + } + ++ sna_xmir_init(sna, screen); ++ + xf86SetBlackWhitePixels(screen); + + xf86SetBackingStore(screen); +diff --git a/src/sna/sna_xmir.c b/src/sna/sna_xmir.c +new file mode 100644 +index 0000000..a7c882d +--- /dev/null ++++ b/src/sna/sna_xmir.c +@@ -0,0 +1,163 @@ ++/*************************************************************************** ++ ++ Copyright 2013 Intel Corporation. All Rights Reserved. ++ ++ Permission is hereby granted, free of charge, to any person obtaining a ++ copy of this software and associated documentation files (the ++ "Software"), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sub license, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ ++ The above copyright notice and this permission notice (including the ++ next paragraph) shall be included in all copies or substantial portions ++ of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ++ IN NO EVENT SHALL INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, ++ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR ++ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR ++ THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++ **************************************************************************/ ++ ++#include ++ ++#include "sna.h" ++ ++#if XMIR ++ ++/* Theory of Operation ++ * ------------------- ++ * ++ * 1. Clients render to their pixmaps and Windows aggregating damage. ++ * 2. Before blocking, we walk the list of dirty Windows and submit ++ * any damage to Mir. This consumes the xfer buffer. ++ * 3. Clients continue to render and we accumulate damage. However, ++ * as there is now no xfer buffer free, damage accumulates. ++ * 4. Mir reports that its exchange has complete and gives us a new ++ * transport buffer. ++ * 5. Before going to sleep, we iterate over dirty Windows and copy ++ * their damage into the xfer buffer and send back to Mir. ++ * ++ * Clients render uninterrupted, but we only send damage to Mir once ++ * every frame. ++ */ ++ ++#define FORCE_FULL_REDRAW 0 ++ ++static void ++sna_xmir_copy_to_mir(WindowPtr win, RegionPtr region) ++{ ++ PixmapPtr src = get_window_pixmap(win); ++ struct sna *sna = to_sna_from_pixmap(src); ++ struct sna_pixmap *priv; ++ struct kgem_bo *bo; ++ BoxRec box, *boxes; ++ int16_t sx, sy; ++ int nbox; ++ ++ if (wedged(sna)) /* XXX need pitch/size for CPU copy fallback */ ++ return; ++ ++ priv = sna_pixmap_force_to_gpu(src, MOVE_READ); ++ if (priv == NULL) ++ return; ++ ++ /* XXX size and pitch are bogus, but only used for sanity checks */ ++ ++ bo = kgem_create_for_prime(&sna->kgem, ++ xmir_prime_fd_for_window(win), ++ priv->gpu_bo->pitch * src->drawable.height); ++ if (bo == NULL) ++ return; ++ ++ bo->pitch = priv->gpu_bo->pitch; ++ ++ if (FORCE_FULL_REDRAW || region == NULL) { ++ box.x1 = box.y1 = 0; ++ box.x2 = src->drawable.width; ++ box.y2 = src->drawable.height; ++ boxes = &box; ++ nbox = 1; ++ } else { ++ boxes = REGION_RECTS(region); ++ nbox = REGION_NUM_RECTS(region); ++ } ++ ++ get_window_deltas(src, &sx, &sy); ++ if (sna->render.copy_boxes(sna, GXcopy, ++ src, priv->gpu_bo, sx, sy, ++ src, bo, 0, 0, ++ boxes, nbox, COPY_LAST)) { ++ kgem_submit(&sna->kgem); ++ xmir_submit_rendering_for_window(win, region); ++ } ++ ++ kgem_bo_destroy(&sna->kgem, bo); ++} ++ ++static void ++sna_xmir_buffer_available(WindowPtr win) ++{ ++ RegionPtr region = xmir_window_get_dirty(win); ++ if (RegionNotEmpty(region)) ++ sna_xmir_copy_to_mir(win, region); ++} ++ ++static void ++sna_xmir_submit_dirty_window(WindowPtr win) ++{ ++ if (!xmir_window_has_free_buffer(win)) ++ return; ++ ++ sna_xmir_copy_to_mir(win, xmir_window_get_dirty(win)); ++} ++ ++static const xmir_driver sna_xmir_driver = { ++ XMIR_DRIVER_VERSION, ++ sna_xmir_buffer_available ++}; ++ ++bool sna_xmir_create(struct sna *sna) ++{ ++ if (!xorgMir) ++ return true; ++ ++ sna->xmir = xmir_screen_create(sna->scrn); ++ if (sna->xmir == NULL) ++ return false; ++ ++ sna->flags |= SNA_IS_HOSTED; ++ return true; ++} ++ ++bool sna_xmir_pre_init(struct sna *sna) ++{ ++ if (sna->xmir == NULL) ++ return true; ++ ++ return xmir_screen_pre_init(sna->scrn, sna->xmir, &sna_xmir_driver); ++} ++ ++void sna_xmir_init(struct sna *sna, ScreenPtr screen) ++{ ++ if (sna->xmir == NULL) ++ return; ++ ++ xmir_screen_init(screen, sna->xmir); ++} ++ ++void sna_xmir_post_damage(struct sna *sna) ++{ ++ if (sna->xmir == NULL) ++ return; ++ ++ xmir_screen_for_each_damaged_window(sna->xmir, ++ sna_xmir_submit_dirty_window); ++} ++ ++#endif --- xserver-xorg-video-intel-2.21.14.orig/debian/patches/Link-the-driver-against-pixman.patch +++ xserver-xorg-video-intel-2.21.14/debian/patches/Link-the-driver-against-pixman.patch @@ -0,0 +1,38 @@ +From 666b4e7005b1b538c0320fbf4117e4477a61f951 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Mon, 12 Aug 2013 19:31:53 +0200 +Subject: [PATCH 1/2] Link the driver against pixman + +--- + configure.ac | 1 + + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 104113e..bd5ce9d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -392,6 +392,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + # Obtain compiler/linker options for the driver dependencies + PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.20]) # libdrm_intel is checked separately + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) ++PKG_CHECK_MODULES(PIXMAN, [pixman-1]) + + LIBS="" + AC_SEARCH_LIBS(clock_gettime, rt, [CLOCK_GETTIME_LIBS=$LIBS]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 16b6967..8810b74 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -37,7 +37,7 @@ AM_CFLAGS = \ + intel_drv_la_LTLIBRARIES = intel_drv.la + intel_drv_la_LDFLAGS = -module -avoid-version + intel_drv_ladir = @moduledir@/drivers +-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ ++intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(PIXMAN_LIBS) + + if SNA + SUBDIRS += sna +-- +1.7.10.4 + --- xserver-xorg-video-intel-2.21.14.orig/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch +++ xserver-xorg-video-intel-2.21.14/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch @@ -0,0 +1,51 @@ +From 73afe87de5d5cab04680c5954dad1f2ee9e2e5f4 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Mon, 12 Aug 2013 14:38:22 +0200 +Subject: [PATCH 1/2] Check for struct sysinfo as well as + +Non-linux glibc systems have the latter but not the former. + +Signed-off-by: Julien Cristau +--- + configure.ac | 2 +- + src/sna/kgem.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7235bde..aa98966 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -211,7 +211,7 @@ AC_ARG_ENABLE(sna, + + if test "x$SNA" != "xno"; then + AC_DEFINE(USE_SNA, 1, [Enable SNA support]) +- AC_CHECK_HEADERS([sys/sysinfo.h]) ++ AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include ]])) + fi + AC_MSG_CHECKING([whether to include SNA support]) + AM_CONDITIONAL(SNA, test x$SNA != xno) +diff --git a/src/sna/kgem.c b/src/sna/kgem.c +index 5afe05f..98e801a 100644 +--- a/src/sna/kgem.c ++++ b/src/sna/kgem.c +@@ -46,7 +46,7 @@ + #include + #endif + +-#if HAVE_SYS_SYSINFO_H ++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM + #include + #endif + +@@ -694,7 +694,7 @@ agp_aperture_size(struct pci_device *dev, unsigned gen) + static size_t + total_ram_size(void) + { +-#if HAVE_SYS_SYSINFO_H ++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM + struct sysinfo info; + if (sysinfo(&info) == 0) + return info.totalram * info.mem_unit; +-- +1.7.10.4 +