--- xserver-xorg-video-intel-2.14.0.orig/autogen.sh +++ xserver-xorg-video-intel-2.14.0/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-intel-2.14.0.orig/RELEASING +++ xserver-xorg-video-intel-2.14.0/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.14.0.orig/debian/copyright +++ xserver-xorg-video-intel-2.14.0/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.14.0.orig/debian/xserver-xorg-video-intel.docs +++ xserver-xorg-video-intel-2.14.0/debian/xserver-xorg-video-intel.docs @@ -0,0 +1,2 @@ +NEWS +README --- xserver-xorg-video-intel-2.14.0.orig/debian/compat +++ xserver-xorg-video-intel-2.14.0/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-intel-2.14.0.orig/debian/control +++ xserver-xorg-video-intel-2.14.0/debian/control @@ -0,0 +1,82 @@ +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, + xserver-xorg-dev (>= 2:1.9.99.903-2ubuntu1~), + 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-aux0-dev, + libxcb-dri2-0-dev, +# end xvmc +# libudev-dev [linux-any], + libudev-dev, + dpkg-dev (>= 1.14.17), + quilt (>= 0.46-7~), + xutils-dev (>= 1:7.5+4), +Standards-Version: 3.9.1 +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 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Recommends: + intel-gpu-tools, + apport, + intel-gpu-tools, + python, +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 +Depends: + xserver-xorg-video-intel (= ${binary:Version}), + ${shlibs: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.14.0.orig/debian/watch +++ xserver-xorg-video-intel-2.14.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-intel-(.*)\.tar\.gz --- xserver-xorg-video-intel-2.14.0.orig/debian/rules +++ xserver-xorg-video-intel-2.14.0/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + install -d $(CURDIR)/debian/tmp/usr/share/apport + install -m 755 debian/apport-gpu-error-intel.py $(CURDIR)/debian/tmp/usr/share/apport + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + 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/ --- xserver-xorg-video-intel-2.14.0.orig/debian/xserver-xorg-video-intel.links +++ xserver-xorg-video-intel-2.14.0/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.14.0.orig/debian/apport-gpu-error-intel.py +++ xserver-xorg-video-intel-2.14.0/debian/apport-gpu-error-intel.py @@ -0,0 +1,138 @@ +#!/usr/bin/python + +import os +import os.path +import sys +import re + +from apport.hookutils import * + +from apport import unicode_gettext as _ + +pci_devices = [ + { 'name':'i810', 're':'(8086:7121)', 'supported':False }, + { 'name':'i810dc', 're':'(8086:7123)', 'supported':False }, + { 'name':'i810e', 're':'(8086:7125)', 'supported':False }, + { 'name':'i815', 're':'(8086:1132|82815)', 'supported':False }, + { 'name':'i830', 're':'(8086:3577|82830)', 'supported':False }, + { 'name':'i845', 're':'(8086:2562|82845G)', 'supported':False }, + { 'name':'i855', 're':'(8086:3582|855GM)', 'supported':False }, + { 'name':'i865', 're':'(8086:2572|82865G)', 'supported':False }, + { 'name':'i915g', 're':'(8086:2582)' }, + { 'name':'i915gm', 're':'(8086:2592|915GM)' }, + { 'name':'e7221', 're':'(8086:258a)', 'supported':False }, + { 'name':'i945g', 're':'(8086:2772|945G[ \/]|82945G[ \/])' }, + { 'name':'i945gm', 're':'(8086:27a2|945GM[ \/]|82945GM[ \/])' }, + { 'name':'i945gme', 're':'(8086:27ae|945GME|82945GME)' }, + { 'name':'IGDg', 're':'(8086:a001)' }, + { 'name':'IGDgm', 're':'(8086:a011)' }, + { 'name':'pineviewg', 're':'(8086:a001)' }, + { 'name':'pineviewgm', 're':'(8086:a011)' }, + { 'name':'i946gz', 're':'(8086:2972|82946GZ)' }, + { 'name':'g35', 're':'(8086:2982|82G35)' }, + { 'name':'i965q', 're':'(8086:2992|Q965)' }, + { 'name':'i965g', 're':'(8086:29a2|G965)' }, + { 'name':'g33', 're':'(8086:29c2|82G33)' }, + { 'name':'q35', 're':'(8086:29b2)' }, + { 'name':'q33', 're':'(8086:29d2)' }, + { 'name':'i965gm', 're':'(8086:2a02|GM965)' }, + { 'name':'i965gme', 're':'(8086:2a12)' }, + { 'name':'gm45', 're':'(8086:2a42)' }, + { 'name':'IGDeg', 're':'(8086:2e02)' }, + { 'name':'q45', 're':'(8086:2e12)' }, + { 'name':'g45', 're':'(8086:2e22)' }, + { 'name':'g41', 're':'(8086:2e32)' }, + { 'name':'b43', 're':'(8086:2e42)' }, + { 'name':'clarkdale', 're':'(8086:0042)' }, + { 'name':'arrandale', 're':'(8086:0046)' }, + { 'name':'sandybridge-gt1', 're':'(8086:0102)' }, + { 'name':'sandybridge-m-gt1', 're':'(8086:0106)' }, + { 'name':'sandybridge-s', 're':'(8086:010a)' }, + { 'name':'sandybridge-gt2', 're':'(8086:0112)' }, + { 'name':'sandybridge-m-gt2', 're':'(8086:0116)' }, + { 'name':'sandybridge-gt2+', 're':'(8086:0122)' }, + { 'name':'sandybridge-m-gt2+','re':'(8086:0126)' }, + ] +for device in pci_devices: + device['rc'] = re.compile(device['re'], re.IGNORECASE) + +def get_pci_device(text): + regex_vga = re.compile('VGA compatible controller (.*)', re.IGNORECASE) + + lines = regex_vga.findall(text) + if len(lines) > 0: + for l in lines: + if len(l.strip())>0: + for device in pci_devices: + if device['rc'].search(l.strip()): + return device + return None + +def get_dump_signature(text): + if not text: + return None + codes = [] + for k in ["EIR", "ESR", "PGTBL_ER", "IPEHR"]: + regex = re.compile(k+": 0x([0-9a-fA-F]+)") + match = regex.search(text) + if match and match.group(1) != "00000000": + codes.append("%s: 0x%s" %(k, match.group(1))) + if len(codes) > 0: + return "(%s)" %( string.join(codes, " ") ) + else: + return "" + +def main(argv=None): + if argv is None: + argv = sys.argv + + from apport.packaging_impl import impl as packaging + if not packaging.enabled(): + return -1 + + import apport.report + report = apport.report.Report(type='Crash') + report.setdefault('Tags', '') + report.setdefault('Title', 'GPU lockup') + + report.add_os_info() + report.add_proc_info() + report.add_user_info() + + report['Package'] = 'xserver-xorg-video-intel' + report['Tags'] += ' freeze' + report['Lspci'] = command_output(['lspci', '-vvnn']) + device = get_pci_device(report['Lspci']) + if device and 'name' in device: + if 'supported' in device and device['supported'] == False: + # Unsupported chipset; we don't want bugs reported for this HW + return -1 + report['Chipset'] = device['name'] + report['Title'] = "[%s] GPU lockup" %(device['name']) + report['IntelGpuDump'] = root_command_output(['intel_gpu_dump']) + dump_signature = get_dump_signature(report['IntelGpuDump']) + if dump_signature: + report['Title'] += " " + dump_signature + # TODO: For oneiric set DuplicateSignature to Title + report['DuplicateSignature'] = dump_signature + + attach_hardware(report) + attach_related_packages(report, ["xserver-xorg", "libdrm2", "xserver-xorg-video-intel"]) + attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') + attach_file(report, '/var/log/Xorg.0.log', 'XorgLog') + attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') + attach_file_if_exists(report, '/sys/kernel/debug/dri/0/i915_error_state', 'i915_error_state') + + nowtime = datetime.datetime.now() + report_filename = '/var/crash/%s.%s.crash' % (report['Package'], str(nowtime).replace(' ', '_')) + report_file = os.fdopen(os.open(report_filename, os.O_WRONLY|os.O_CREAT|os.O_EXCL), 'w') + os.chmod(report_filename, 0600) + + try: + report.write(report_file) + finally: + report_file.close() + return 0 + +if __name__ == '__main__': + sys.exit(main()) --- xserver-xorg-video-intel-2.14.0.orig/debian/xserver-xorg-video-intel.install +++ xserver-xorg-video-intel-2.14.0/debian/xserver-xorg-video-intel.install @@ -0,0 +1,6 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/man + +usr/share/apport/* --- xserver-xorg-video-intel-2.14.0.orig/debian/xserver-xorg-video-intel.postinst.in +++ xserver-xorg-video-intel-2.14.0/debian/xserver-xorg-video-intel.postinst.in @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postinst +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +if dpkg --compare-versions "$2" lt 2:2.9.1-3ubuntu4; then + remove_conffile_commit /etc/modprobe.d/i915-kms.conf +fi + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-intel-2.14.0.orig/debian/xserver-xorg-video-intel.preinst.in +++ xserver-xorg-video-intel-2.14.0/debian/xserver-xorg-video-intel.preinst.in @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=preinst +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +# We don't want this config file in Ubuntu +if dpkg --compare-versions "$2" lt-nl 2:2.9.1-3ubuntu4; then + remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf +fi + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-intel-2.14.0.orig/debian/changelog +++ xserver-xorg-video-intel-2.14.0/debian/changelog @@ -0,0 +1,3039 @@ +xserver-xorg-video-intel (2:2.14.0-4ubuntu5) natty; urgency=low + + * apport-gpu-error-intel.py: Don't file gpu lockup bug reports for older + 8xx hardware, as per Canonical-X team HW support policies. + + -- Bryce Harrington Thu, 31 Mar 2011 23:49:15 -0700 + +xserver-xorg-video-intel (2:2.14.0-4ubuntu4) natty; urgency=low + + * apport-gpu-error-intel.py + - Add DuplicateSignature, which apport will use for automatic + duplicate detection. + - Drop use of hash codes as a dump signature. When there are no error + codes the bug report is unactionable anyway, so use of hash codes to + defeat duplication has minimal value, and it may inhibit proper + duplication detection from working. + - Drop DumpSignature since DuplicateSignature fulfils the same + purpose. + + -- Bryce Harrington Fri, 18 Mar 2011 13:49:33 -0700 + +xserver-xorg-video-intel (2:2.14.0-4ubuntu3) natty; urgency=low + + [ Bryce Harrington ] + * apport-gpu-error-intel.py: + - Drop some pci id's which are actually bridge chips + + [ Christopher James Halse Rogers ] + * Rebuild against final Xserver 1.10 video ABI + * debian/control: + - Add version to quilt dependency for dh sequence. Quietens lintian. + + -- Christopher James Halse Rogers Thu, 17 Mar 2011 09:52:09 +1100 + +xserver-xorg-video-intel (2:2.14.0-4ubuntu2) natty; urgency=low + + * apport-gpu-error-intel.py: + - Omit the hexdigest code from the title if we have two or more + non-zero GPU error codes. A pair of error codes has proven to be an + adequately good unique identifier for bugs. + - Add latest SandyBridge GPU PCI IDs + + -- Bryce Harrington Tue, 08 Mar 2011 13:25:45 -0800 + +xserver-xorg-video-intel (2:2.14.0-4ubuntu1) natty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py: + - debian/control: + - debian/rules: + - debian/xserver-xorg-video-intel.install: + - debian/xserver-xorg-video-intel.udev + + Add apport hook, triggered on udev GPU error event + - debian/control: + + Drop [linux-any] qualifier on libudev-dev build-dep to work around + pbuilder bug. + - debian/patches/101_copy-fb.patch: + + Plymouth integration patch + - debian/patches/107_solid_nullptr_check.patch: + + Check null return from uxa_acquire_solid() + - debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch: + + Fix font corruption (missing glyphs) on rotated screens. + - debian/patches/110_warnings_cleanup.patch: + - debian/patches/114_warnings_cleanup_part_2.patch: + + Cherry picks to fix a large number of build warnings. + - debian/patches/111_fix_clipped_window_plane_offset.patch: + - 112_fix_error_in_4c4ad555.patch: + + Fix issue where vertical green line and strange colors shows up when + playing gstreamer with certain videos, when dragged. (LP 460677) + - debian/patches/113_remove_broken_max_base_addresses.patch: + + Fixes GPU lockup during login with + "Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" error messages + listed in the gpu dump text. (LP 710321) + - debian/patches/115_quell_vblank_counter_failed.patch: + + Don't fill up Xorg.0.log with + "get vblank counter failed: Invalid argument" warnings. + 5 is enough. (LP 710594) + - debian/xserver-xorg-video-intel.preinst.in: + - debian/xserver-xorg-video-intel.postinst.in: + + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades. KMS + is the kernel default. + * Pull prerequisite commit into + 109_dont_reconstruct_glyph_cache_on_rotate.patch. We mostly didn't notice + because the copy-fb codepath initialises the resources itself. Fixes + Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid + graphics systems. (LP: #718620) + * debian/control: + - Dropped Ubuntu change: remove a bunch of Conflicts/Replaces against + packages last seen in Hardy. + + -- Christopher James Halse Rogers Wed, 02 Mar 2011 14:12:35 +1100 + +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-1ubuntu12) natty; urgency=low + + * Pull prerequisite commit into + 109_dont_reconstruct_glyph_cache_on_rotate.patch. We mostly didn't notice + because the copy-fb codepath initialises the resources itself. Fixes + Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid + graphics systems. (LP: #718620) + + -- Christopher James Halse Rogers Wed, 02 Mar 2011 14:12:35 +1100 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu11) natty; urgency=low + + [Brian Murray] + * apport-gpu-error-intel.py: intel_gpu_dump must be called with root perms. + (LP: #723624) + + -- Bryce Harrington Thu, 24 Feb 2011 18:40:15 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu10) natty; urgency=low + + * Rebuild to pick up new Xserver dependencies + + -- Christopher James Halse Rogers Wed, 23 Feb 2011 17:53:32 +1100 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu9) natty; urgency=low + + * Add 115_quell_vblank_counter_failed.patch: Don't fill up Xorg.0.log + with "get vblank counter failed: Invalid argument" warnings. 5 is + enough. + (LP: #710594) + + -- Bryce Harrington Tue, 15 Feb 2011 19:11:25 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu8) natty; urgency=low + + * 111_fix_clipped_window_plane_offset.patch, + 112_fix_error_in_4c4ad555.patch: Fixes issue where vertical green line + and strange colors shows up when playing gstreamer with certain + videos, when dragged. + (LP: #460677) + * 113_remove_broken_max_base_addresses.patch: Fixes GPU lockup during + login with "Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" error + messages listed in the gpu dump text. + (LP: #710321) + * 114_warnings_cleanup_part_2.patch: Additional warnings cleanup to the + xvmc code, cherrypicked from upstream commit ae8877e3. + + -- Bryce Harrington Mon, 14 Feb 2011 15:45:48 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu7) natty; urgency=low + + * Rename 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch + to 108_undo_dmg_trans_before_append.patch for clarity. + * Add 109_dont_reconstruct_glyph_cache_on_rotate.patch: Fixes font + corruption (missing glyphs) on rotated screens. Cherrypick of + upstream commit c6dc2756. + (fdo #33412) + * Add 110_warnings_cleanup.patch: Tidy up a few build warnings. + Cherrypicks from upstream tree. + * apport-gpu-error-intel.py: + + Include a couple more error codes for GPU freezes + + Take any matched error code, not just the first seen + + Improve matching of hexadecimal numbers + + Strip out appending MachineType to title (it's never set) + + -- Bryce Harrington Fri, 11 Feb 2011 15:57:19 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu6) natty; urgency=low + + * 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch: + - cherry-pick fix from upstream git to fix graphics corruption + (LP: #707236) + + -- Michael Vogt Thu, 03 Feb 2011 14:49:50 +0100 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu5) natty; urgency=low + + * control: For apport hook, depend on apport, intel-gpu-tools, and + python instead of python-dev. + + -- Bryce Harrington Tue, 01 Feb 2011 09:59:31 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu4) natty; urgency=low + + * Rebuild against Xserver 1.10 + + -- Bryce Harrington Mon, 31 Jan 2011 18:53:00 -0800 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu3) natty; urgency=low + + * debian/patches/101_copy-fb.patch: Fix 1.10 video ABI codepath + + -- Christopher James Halse Rogers Thu, 27 Jan 2011 18:53:35 +1100 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu2) natty; urgency=low + + * debian/patches/101_copy-fb.patch: + - Remove call to non-existent intel_batch_wait_last function. Fixes + X crash on startup due to missing symbols. + - Update to build against both X server 1.9 and 1.10 ABIs. + + -- Christopher James Halse Rogers Thu, 27 Jan 2011 11:40:37 +1100 + +xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty; urgency=low + + * New upstream release. + - Sandy Bridge RENDER and XVIDEO acceleration + - i965+ RENDER acceleration + - Fix backlight on Arrandale (LP: #705949) + * Remaining Ubuntu Changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev, + debian/xserver-xorg-video-intel: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel + package for use by GPU hang scripts. + - xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in, + rules: + Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades. + At best it's redundant (as the kernel defaults to KMS), at worst it breaks + the ability to disable KMS. + - 107_solid_nullptr_check.patch: Check null return from uxa_acquire_solid() + + [Bryce Harrington] + * Change dep on libudev-dev to not limit to linux-any (fixes FTBS when + using pbuilder, see deb bug 600823) + * Add python-dev recommends for xserver-xorg-video-intel, needed by + debian/apport-gpu-error-intel.py + * Drop 106_restore_backlight_at_mode_set.patch: Included in release + + -- Robert Hooker Mon, 24 Jan 2011 12:58:42 -0500 + +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-2ubuntu3) natty; urgency=low + + * Add 107_solid_null_ptr.patch: uxa_acquire_solid() can return NULL + under some circumstances, so check for this when called. + (LP: #705078) + + -- Bryce Harrington Fri, 21 Jan 2011 19:17:34 -0800 + +xserver-xorg-video-intel (2:2.13.901-2ubuntu2) natty; urgency=low + + * Add 106_restore_backlight_at_mode_set.patch: Force DPMS to On for all + outputs, to match kernel behavior, and restore the backlight level on + resume. + (LP: #685767) + + -- Bryce Harrington Mon, 13 Dec 2010 15:26:39 -0800 + +xserver-xorg-video-intel (2:2.13.901-2ubuntu1) natty; urgency=low + + * New upstream release. + - Fixes a GPU lockup when using java (LP: #668270) + * Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev, + debian/xserver-xorg-video-intel: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - 105_sandybridge_dri_disable.patch: Disable DRI on Sandybridge until it is + working (drop with mesa 7.10). + - control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel + package for use by GPU hang scripts. + - xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in, + rules: + Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades. + At best it's redundant (as the kernel defaults to KMS), at worst it breaks + the ability to disable KMS. + + -- Bryce Harrington Tue, 30 Nov 2010 10:59:32 -0800 + +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-1ubuntu1) natty; urgency=low + + * New upstream release. Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev, + debian/xserver-xorg-video-intel: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - 105_sandybridge_dri_disable.patch: Disable DRI on Sandybridge until it is + working (drop with mesa 7.10). + - 108_sandybridge_disable_Xv.patch: Disable Xv on Sandybridge until it is + supported. (Drop with intel 2.13.901). + - control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel + package for use by GPU hang scripts. + - xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in, + rules: + Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades. + At best it's redundant (as the kernel defaults to KMS), at worst it breaks + the ability to disable KMS. + * Dropped patches: + 100_b43_pciid_update.patch: Upstream + 102-disable-page-flipping-v2.patch: Should be unneeded. + 103-mbp-backlight-support.patch: Upstream + 104_sandybridge_id_update.patch: Upstream + 106_backport_vblank_on_server_regenerate_fix.patch: Upstream + + -- Robert Hooker Mon, 08 Nov 2010 11:27:15 -0500 + +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-1ubuntu5.1) maverick-proposed; urgency=low + + * debian/patches/108_sandybridge_disable_Xv.patch: Disable Xv code + on sandybridge generation GPU's only, support does not exist in + this driver release and it attempts to use an old code path that + causes a GPU hang every time it is used. (LP: #654876) + + -- Robert Hooker Thu, 07 Oct 2010 13:04:33 -0400 + +xserver-xorg-video-intel (2:2.12.0-1ubuntu5) maverick; urgency=low + + [ Robert Hooker ] + * Disable DRI on Sandybridge chipsets. Support for them will not be released + until the Q42010 Intel releases, which will not be pulled into maverick. + Without this change, all 3D apps on these devices cause hangs. + (LP: #639667) + * Add 102_b43_pciid_update.patch. Fixes detection of a new b43 + chipset revision that is being shipped. Without this the drivers + will not attempt to load even though this chipset is the same as + the previous b43 ones. Backport of upstream commit 55b5fe8880. + (LP: #640214) + + [ Christopher James Halse Rogers ] + * debian/patches/101_copy-fb.patch: Move scratch pixmap creation to the + drmmode_copy_fb function, and clean up after we've used it. Fixes the + SIGSEGV in FreeClientResources when logging out of KDE (LP: #628077) + * debian/patches/106_backport_vblank_on_server_regenerate_fix.patch: + Backport fix for SwapBuffers hang after server regenerate. LP 628077 + was hiding this by crashing the server. Fixes kwin desktop effects hanging + on second and subsequent logins. + * Cherry-pick e30f0338 to free the Screen pixmap on close. Fixes a memory + leak on server regeneration, and another crash on KDE log out hidden by + LP 628077. + + -- Christopher James Halse Rogers Mon, 27 Sep 2010 14:34:27 +1000 + +xserver-xorg-video-intel (2:2.12.0-1ubuntu4) maverick; urgency=low + + * debian/patches/101_copy-fb.patch: Explicitly disable copyfb functionality + on gen6 (Sandybridge) where it is not working. + * Update Sandybridge device id's. (LP: #632488) + + -- Robert Hooker Fri, 10 Sep 2010 07:39:32 -0400 + +xserver-xorg-video-intel (2:2.12.0-1ubuntu3) maverick; urgency=low + + [ Christopher James Halse Rogers ] + * debian/patches/101_copy-fb.patch: + + Update for Xserver 1.9 + * debian/control: + + Bump build-depends on xserver-xorg-dev to ensure we pick up the new ABI + + [ Martin Pitt ] + * debian/rules: Do not install the big upstream changelog. + + -- Christopher James Halse Rogers Mon, 02 Aug 2010 15:54:36 +1000 + +xserver-xorg-video-intel (2:2.12.0-1ubuntu2) maverick; urgency=low + + * Re-add 102-disable-page-flipping-v2.patch. Spate of freeze bugs: recieved. + (LP: #609073) + + -- Christopher James Halse Rogers Fri, 23 Jul 2010 11:30:05 +0200 + +xserver-xorg-video-intel (2:2.12.0-1ubuntu1) maverick; urgency=low + + * Merge from Debian experimental (LP: #601052). Remaining Ubuntu changes: + + debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev, + debian/xserver-xorg-video-intel: + Add apport script to collect debug information on GPU hangs + + rules: Install udev rule to run the script when the kernel detects hung + GPU. + + 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + + control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel + package for use by GPU hang scripts. + + xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in, + rules: + Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades. + At best it's redundant (as the kernel defaults to KMS), at worst it breaks + the ability to disable KMS. + + 103-mbp-backlight-support.patch: Enables xrandr backlight control for + macbook's using the mbp_backlight module. + * Drop 102-disable-page-flipping-v2.patch: all the upstream bugs mentioned + in the patch are closed. If we get a spate of freeze bugs, start looking + here. + + -- Christopher James Halse Rogers Mon, 19 Jul 2010 16:36:28 +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-1ubuntu2) maverick; urgency=low + + * No change rebuild with the new xserver + + -- Sebastien Bacher Wed, 09 Jun 2010 18:56:26 +0200 + +xserver-xorg-video-intel (2:2.11.0-1ubuntu1) maverick; urgency=low + + [ Christopher James Halse Rogers ] + * Merge from Debian experimental. Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev, + debian/xserver-xorg-video-intel: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel + package for use by GPU hang scripts. + - xserver-xorg-video-intel.preinst.in, xserver-xorg-video-intel.postinst.in, + rules: + Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades. + At best it's redundant (as the kernel defaults to KMS), at worst it breaks + the ability to disable KMS. + + [ Robert Hooker ] + * Add 102-disable-page-flipping-v2.patch: Disables page flipping support which + is causing frequent hangs, but leaves the events. + * Add 103-mbp-backlight-support.patch: Enables xrandr backlight control for + macbook's using the mbp_backlight module. (LP: #417770) + + -- Robert Hooker Sat, 29 May 2010 20:49:31 -0400 + +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-3ubuntu5) lucid; urgency=low + + * Drop debian/patches/107_disable_dri_on_845_855.patch: + + This attempt to work around the crashes on i845 and i855 documented in + LP: #541492 and LP: #541511 simply shuffled the brokeness around. It + hasn't helped enough, and it unconditionally disables 3D which worked for + some users before. + + -- Christopher James Halse Rogers Mon, 26 Apr 2010 10:14:02 +1000 + +xserver-xorg-video-intel (2:2.9.1-3ubuntu4) lucid; urgency=low + + * Drop /etc/modprobe.d/i915-kms.conf; in the best case it's redundant + because KMS is on by default in the Ubuntu kernel, in the worst case it + breaks our ability to forcibly disable KMS when there's a problem. + + -- Steve Langasek Thu, 15 Apr 2010 03:41:11 -0700 + +xserver-xorg-video-intel (2:2.9.1-3ubuntu3) lucid; urgency=low + + [Christopher James Halse Rogers] + * debian/patches/107_disable_dri_on_845_855.patch: + + Disable DRI on i845 and i855 chips. Works around the stability problems + these chips have in Lucid (LP: #541492, LP: #541511). + + -- Bryce Harrington Tue, 13 Apr 2010 15:25:23 -0700 + +xserver-xorg-video-intel (2:2.9.1-3ubuntu2) lucid; urgency=low + + * Add 107_i830_clip_solid_fills_to_surface.patch: Clip x,y bounds of + solid fills to the min and max coordinates of the pixmap being filled. + Partial fix to some of the 8xx freeze issues. Cherrypick from + upstream git commit 0c47195c by Chris Wilson. + + -- Bryce Harrington Tue, 13 Apr 2010 13:58:15 -0700 + +xserver-xorg-video-intel (2:2.9.1-3ubuntu1) lucid; urgency=low + + * Merge with Debian. + - Backport KMS video overlay from upstream 2.10 (lp: #395932) + * Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - control: Add intel-gpu-tools to Recommends for use by the above + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - Drop xserver-xorg-video-intel-dbg.install: intel_reg_dumper is now + provided by the intel-gpu-tools package. + - apport-gpu-error-intel.py, xserver-xorg-video-intel.install, + xserver-xorg-video-intel.udev: Add apport hook to catch X freeze bugs + - 102_avoid_flushing_null.patch: Cherrypick from upstream to I830. + - 103_check_for_overflow.patch: Cherrypick from upstream to I915. + - 104_fail_when_prop_values_gone.patch: Cherrypick from upstream to + drmmode_display. + * Reduce libdrm-dev requirement to 2.6.18 + * Add 105_free_after_printing.patch: Cherrypick from upstream. + Avoid printing a just-freed string if the DRM device could not be opened. + * Add 106_initialize_drmmode_output.patch: Cherrypick from upstream. + Clear mode_output during output destroy. + + -- Bryce Harrington Wed, 31 Mar 2010 14:36:51 -0700 + +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-1ubuntu18) lucid; urgency=low + + * Add 102_avoid_flushing_null.patch: Cherrypick from upstream to I830. + During shutdown from a FatalError during batchbuffer submission, it is + possible for the batch_ptr to be NULL, so we must be careful not to + append a flush on this error path. + * Add 103_check_for_overflow.patch: Cherrypick from upstream to I915. + Check for overflow before overflowing. As the immediate victim of the + overflow would be to overwrite the maximum permissible value, the test + was optimistic. + * Add 104_fail_when_prop_values_gone.patch: Cherrypick from upstream to + drmmode_display. Return failure when the enum-type output property + values are not found Failure to do so causes xrandr to report + incorrect property values. + + -- Bryce Harrington Tue, 30 Mar 2010 17:36:27 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu17) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Disable freeze hook. We've got ample bug reports now which should + cover the range of bugs people are seeing, and the script is mostly + capturing dupes now. We might re-enable it later once these bugs + are sorted out, if we want more data. + (LP: #533945) + + -- Bryce Harrington Tue, 23 Mar 2010 16:20:18 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu16) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Better fix for checking MachineType and other parameters to + be defined before using them in bug report titles. Thanks Jan! + (LP: #539533) + + -- Bryce Harrington Wed, 17 Mar 2010 11:36:02 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu15) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + It seems ESR is unuseful + + Fix check for MachineType in report to not crash apport + + -- Bryce Harrington Mon, 15 Mar 2010 10:13:44 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu14) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Also include EIR if non-zero + + -- Bryce Harrington Thu, 11 Mar 2010 16:50:48 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu13) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + 8 characters worth of the dump signature is sufficient for dupe + identification + + Identify error code from PGTBL_ER or ESR if non-zero + + Mention machine type in title if available + + -- Bryce Harrington Thu, 11 Mar 2010 16:19:43 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu12) lucid; urgency=low + + * debian/rules: Dropping the --enable-kms-only flag from revision + 2:2.9.1-1ubuntu4. Subsequent discussion indicates that sticking + with 2.9 and preserving UMS as a fallback option will help users + still seeing severe issues with KMS but not UMS (e.g. 8xx owners). + + -- Bryce Harrington Tue, 09 Mar 2010 13:17:26 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu11) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Drop check_ignored() entirely; pitti says it's unnecessary for + non-crash bugs. + + -- Bryce Harrington Wed, 03 Mar 2010 15:24:22 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu10) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + check_ignored() can be called only after ExecutablePath is defined + (LP: #530650) + + -- Bryce Harrington Wed, 03 Mar 2010 14:11:32 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu9) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Add several new chipnames (thanks Geir!) + + Remove duplicate attach_hardware() call + + -- Bryce Harrington Wed, 03 Mar 2010 09:55:35 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu8) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Set the default title for freeze reports to "GPU lockup" + + Determine the chipset, and prepend it to the title + + Calculate a signature of the dump so we can more easily identify + dupe freezes. Append to the title. + + Include i915_error_state if it exists + + -- Bryce Harrington Mon, 01 Mar 2010 13:28:56 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu7) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Add Xorg.0.log and other useful information to capture + + s/pr/report/g for consistency with xorg apport script + + Tag as a freeze bug + + -- Bryce Harrington Sat, 27 Feb 2010 11:38:41 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu6) lucid; urgency=low + + * debian/xserver-xorg-video-intel.udev: Fix typo + (LP: #525433) + + -- Bryce Harrington Sun, 21 Feb 2010 15:02:03 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu5) lucid; urgency=low + + * debian/xserver-xorg-video-intel.udev: Update udev rule to trigger + apport properly when X freezes. + + -- Bryce Harrington Thu, 18 Feb 2010 16:20:46 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu4) lucid; urgency=low + + * debian/rules: Build -intel to enable KMS only, no UMS. UMS + will be removed in version 2.10 so we don't plan to support + it in Lucid. + + -- Bryce Harrington Fri, 05 Feb 2010 17:17:49 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu3) lucid; urgency=low + + * debian/rules: Need to create usr/share/apport before installing into + it. + + -- Bryce Harrington Wed, 27 Jan 2010 17:31:24 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu2) lucid; urgency=low + + * Drop xserver-xorg-video-intel-dbg.install: intel_reg_dumper is now + provided by the intel-gpu-tools package. + * xserver-xorg-video-intel.install: Install apport-gpu-error-intel.py + to /usr/share/apport/ + + -- Bryce Harrington Tue, 12 Jan 2010 02:52:41 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - control: Add intel-gpu-tools to Recommends for use by the above + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + * Build against xserver 1.7. + + -- Timo Aaltonen Mon, 07 Dec 2009 16:23:16 +0200 + +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-1ubuntu4) lucid; urgency=low + + [Matt Zimmerman] + * debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + * rules: Install udev rule to run the script when the kernel detects hung GPU + * control: Add intel-gpu-tools to Recommends for use by the above + + -- Bryce Harrington Thu, 26 Nov 2009 00:53:06 -0800 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu3) lucid; urgency=low + + * Add 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + + -- Bryce Harrington Mon, 23 Nov 2009 14:29:44 -0800 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu2) karmic; urgency=low + + * Add 100_drop_fb_from_crtc.patch. Fixes lockup with black screen on + logout of KDE with KMS enabled. Patch zeroes out the framebuffer id + to clean up on screen closure. Cherrypick from upstream. + (LP: #432521) + + -- Bryce Harrington Tue, 13 Oct 2009 11:31:29 -0700 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu1) karmic; urgency=low + + [Tormod Volden] + * Merge with Debian. Remaining Ubuntu changes: + + debian/control: Add lpia architecture + * Drop patches now included upstream: + + 100_8xx_perf_pict_a8.patch + + 101_reload_cursors.patch + + 102_dont_destroy_bufmgr_at_closescreen_time.patch + * Ubuntu bugs fixed in this release: + + Calculate the DVO relative offset in LVDS data entry to get the DVO + timing. Fixes black screen at boot on i855 due to not finding LVDS + modes. + (LP: #410455) + + Fix brightness by enabling BACKLIGHT property for KMS. + (LP: #397617) + + -- Bryce Harrington Wed, 07 Oct 2009 20:09:54 -0700 + +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-1ubuntu2) karmic; urgency=low + + * Add 102_dont_destroy_bufmgr_at_closescreen_time.patch: Don't destroy + bufmgr at CloseScreen time (LP: #428662). + + -- Alberto Milone Fri, 25 Sep 2009 14:53:26 +0200 + +xserver-xorg-video-intel (2:2.8.1-1ubuntu1) karmic; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + control: Add lpia architecture + + Fixes bad chroma upsampling on videos (LP: #371605) + * Add 100_8xx_perf_pict_a8.patch: Improve performance on i845 by adding + limited support for a8 dests. Cherrypick from upstream master tree. + (LP: #382017) + * Add 101_reload_cursors.patch: Reload cursors as needed when setting + new modes. Fixes issue where cursor doesn't rotate when the screen + is rotated. Cherrypick from upstream master tree. + (LP: #410255) + + -- Bryce Harrington Wed, 26 Aug 2009 23:52:33 -0700 + +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.8.0-0ubuntu2) karmic; urgency=low + + * No change rebuild against the new dri2proto 2.1 features since xserver + was upgraded. + + -- Bryce Harrington Wed, 05 Aug 2009 07:49:03 -0700 + +xserver-xorg-video-intel (2:2.8.0-0ubuntu1) karmic; urgency=low + + * New upstream release 2.8.0 + * Disable installation of ChangeLog + + -- Bryce Harrington Tue, 21 Jul 2009 01:23:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.902+git20090720.bb300738-0ubuntu1) karmic; urgency=low + + * Update to git 20090720 (master branch) up to commit bb300738 + - Fix intel driver reports Couldn't find PLL settings on i915 + (LP: #312133) + - Fix X freezing on intel 855GM + (LP: #370292) + - Implement vblank sync'd GL buffer swap + (LP: #377090) + + -- Bryce Harrington Mon, 20 Jul 2009 22:05:31 -0700 + +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+git20090702.74227141-0ubuntu1) karmic; urgency=low + + [Robert Hooker] + * Update to git 20090702 (master branch) up to commit 74227141 + - Treat disabled CRTCs as "not covering" for scanline wait purposes. + Fixes problems returning from a dpms off state. + (LP: #390917, #383973, #390633, #385448, #388357) + - Add an xorg.conf option to control swapbuffers behavior. + - Set hot plug interrupt to detect HDMI output. + - Add a pipe-a quirk for Dell mini + (LP: #395306) + - Add a pipe-a quirk for thinkpad x30 + (LP: #304614) + - Reenable XvMC support in UXA. Now includes vld support. + - Fix EDID for LVDS output device to add the default modes in UMS. + (LP: #385832) + - Export EDID when using KMS, so Display options shows info correctly + (LP: #395140) + - Fixes for SDVO LVDS mode detection. + - Fix major performance regression of trapezoid rendering in UXA. + - Fixes for hangs when GL compositing is used with multiple monitors + with different refresh rates. + - Support for new IGDNG devices. + - Only get the VBIOS in non-KMS mode + - Add a few error messages for DRM initialization + - Don't try to pin buffers in KMS mode + - Fix 945GM VT switch in UMS + - Clear the bo on the rotate scratch pixmap (Fixes problems with rotation) + - uxa: Fix segfault on source-only picture usage with FallbackDebug. + - Various XvMC fixes. + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + * Drop patches since they're already upstream: + - 110_quirk_hp_mini.patch + - 117_quirk_thinkpad_x30.patch + - 118_pixmap_inline_funcs.patch + - 119_fix_drawable_abuse.patch + - 120_fix_dri2_vblank_syncing_segfault.patch + - 121_dont_change_blank_sync_width.patch + - 122_wait_for_vblank_to_sub_border_color.patch + - 123_kms_export_edid.patch + + -- Bryce Harrington Thu, 09 Jul 2009 14:02:45 -0700 + +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+git20090602.ec2fde7c-0ubuntu5) karmic; urgency=low + + * Add 123_kms_export_edid.patch: Allow EDID to be exported in the KMS + case as a randr property. This should help the display properties applet + list the proper resolutions, and solve some dpi issues. + + -- Bryce Harrington Wed, 01 Jul 2009 19:54:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu4) karmic; urgency=low + + * Add 122_wait_for_vblank_to_sub_border_color.patch: Wait for next + Vblank to substitue border color for Color info. Otherwise, this can + result in incorrect resolution detection due to phantom VGA port + on i915 and earlier. Cherrypick from upstream's main branch. + (LP: #273306) + + -- Bryce Harrington Sat, 27 Jun 2009 16:15:14 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu3) karmic; urgency=low + + * Add 121_dont_change_blank_sync_width.patch: Don't change the + blank/sync width when calculating scaled modes. Fixes fullscreen + graphical corruption on LVDS. + (LP: #351761) + + -- Bryce Harrington Sat, 27 Jun 2009 15:53:47 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu2) karmic; urgency=low + + * Add 118_pixmap_inline_funcs.patch, 119_fix_drawable_abuse.patch, + 120_fix_dri2_vblank_syncing_segfault.patch: Cherrypicks from upstream + to fix segfault associated with a last minute commit in the prior + snapshot to enable vsync for DRI2 CopyRegion. + (LP: #383129) + + -- Bryce Harrington Thu, 04 Jun 2009 07:45:05 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu1) karmic; urgency=low + + * Update to git 20090602 (master branch) up to commit ec2fde7c + - xvmc is disabled since DRI1 no longer supported + - LP: #96991 - 3D stuff breaks with Compiz: Redirected Direct Rendering + is needed in DRI + - LP: #120834 - X freezes with I830WaitLpRing error when running OpenGL apps + - LP: #337608 - X crashes in fbBlt() when using Sun Java Plugin 6 + firefox3.0 + - LP: #339555 - compiz slowmotion after Jaunty upgrade + - LP: #363900 - X.org freezes with intel driver, no apparent trigger + - LP: #331719 - VT switching doesn't work on Intel 915GM + - LP: #339091 - X freezes a few minutes after resuming + - LP: #348436 - Kubuntu: X server crash when screensaver is started (4500MHD) + - LP: #279727 - Kubuntu: Display Corruption w/ Intel 4700MHD + - LP: #357851 - Kubuntu: Distorted display after switching virtual desktops w/ exa + - LP: #158415 - Front buffer dynamic resize not supported + - LP: #324998 - x server restarts itself w/ compiz on Intel 945GM + - LP: #355593 - after upgrade to 9.04, rotating desktop cube ran slow + - LP: #357290 - 1 fps in 3d apps like neverball with EXA + - LP: #360774 - Graphical Corruption with EXA on X4500 + - LP: #364126 - screensaver prefs dialog in 9.04 RC livecd leaves dirt + - LP: #375712 - Native resolution for dell "2005fpw" monitor not listed + - LP: #375264 - Choppy flash video and poor performance with compiz + - LP: #349568 - Jaunty / Compiz slow and tearing on GMA 4500MHD + - LP: #356056 - window tearing during movement on 965 (no compiz) + - LP: #330460 - xorg shows black image/hangs with jpg in firefox + - LP: #347587 - X asserts on pI830->batch_ptr != 0 on resume from suspend + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + - Re-enable the patch system, add quilt to build-deps. + - 110_quirk_hp_mini.patch: quirk (sent upstream) + - 117_quirk_thinkpad_x30.patch: quirk (sent upstream) + * Drop 116_8xx_disable_dri.patch. There have been fixes for 3d on 8xx + chipsets upstream, so drop the DRI disablement so the fixes can be + re-tested. + * Drop 103_quirk_intel_mb890.patch. Better quirk available upstream. + (LP: #305269) + + -- Bryce Harrington Tue, 02 Jun 2009 10:47:32 -0700 + +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-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + * Drop 119_drm_bo_unreference_needs_null.patch: upstream. + * Re-enable the patch system, add quilt to build-deps. + + -- Timo Aaltonen Fri, 22 May 2009 11:17:55 +0300 + +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-1ubuntu2) karmic; urgency=low + + * Drop 109_i830-fifo-watermark-conservative.patch: + + Patch was insufficient to fix #311895, and doesn't help any more + anyway. + + -- Bryce Harrington Sat, 16 May 2009 13:50:15 -0700 + +xserver-xorg-video-intel (2:2.7.0-1ubuntu1) karmic; urgency=low + + * Merge from Debian of upstream's 2.7.0 release. + - Fixes: memory leak causes system to run out of memory + (LP: #360319) + - Fixes: Video playback suffers from tearing on GMA 4500MHD + (LP: #339233) + - Fixes: powertop wakeups 71.6 : i915@pci + (LP: #352763) + - Fixes: `man intel` does not mention UXA in the AccelMethod section + (LP: #364284) + - Fixes: TV Format changes don't work + (LP: #298422) + * Remaining ubuntu changes against Debian version: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 109_i830-fifo-watermark-conservative.patch: Still in progress + upstream in fd.o #19304, but retain as a placeholder until better + fix is found. + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + - 119_drm_bo_unreference_needs_null.patch: Fixes several crashes; + seems not to be included upstream yet. + * Drop patches no longer needed: + - Drop 112_num_used_fences.patch; no longer needed with updated kernel + - Drop 105_no_modesetting.diff; now we want to enable kernel modesetting + - Drop 115_fix_crash_xv_overlay.patch; included in upstream + - Drop 118_drop_legacy3d.patch; included in upstream + - Drop 120_fix_vt_switch.patch; included in upstream + - Drop 106_remove_triple_buffering.diff; included in upstream + - Drop 107_remove_pageflipping.diff; included in upstream + * Refresh 119_drm_bo_unreference_needs_null.patch to apply + + -- Bryce Harrington Fri, 08 May 2009 12:08:57 -0700 + +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.3-0ubuntu9) jaunty; urgency=low + + * Add 120_fix_vt_switch.patch: Fix null pointer deref in + I830StopVideo(), which can lead to segfaults calling + drm_intel_bo_unpin or drm_intel_bo_unreference when entering DPMS. + Thanks to unggnu for shepherding this bug to solution! + (LP: #345796) + + -- Bryce Harrington Wed, 08 Apr 2009 19:12:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu8) jaunty; urgency=low + + * Expand patch 116 and rename to 116_8xx_disable_dri.patch to + fix freezing issue on i810 as well. + (LP: #279835) + + -- Bryce Harrington Mon, 06 Apr 2009 18:18:46 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu7) jaunty; urgency=low + + * Add 119_drm_bo_unreference_needs_null.patch: + - The first time through the Xv code, an allocated buffer is + unreferenced but the pointer is not reset to NULL. Thus, the next time + a video is played, -intel thinks it has a valid buffer and crashes + when it tries to access the freed memory. Fixes a number of crashes + reported since moving to the 2.6.3 driver. + - Fixes crash on i945 with frame buffer width > 2048. DRI is disabled + on this chipset when the frame buffer exceeds this width. + (LP: #354688) + - Fixes crash on i865 where DRI is off because of patch 116 + (LP: #352760) + - Fixes crash on i845 starting after 304871 was fixed + (LP: #354889) + - Fixes crash on i830 when manually disabling DRI + (LP: #347527) + + -- Bryce Harrington Mon, 06 Apr 2009 14:28:29 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu6) jaunty; urgency=low + + * Update 116_865g_disable_dri.patch: Permit DRI on 845. + Evidence so far suggests the freezes on 845 due to DRI are gone. + + -- Bryce Harrington Sat, 04 Apr 2009 12:49:38 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu5) jaunty; urgency=low + + * Disable 114_fix_xv_with_non_gem.patch: At the time we accepted it, it + sounded a little risky, so I took it on the condition that it didn't + cause regressions, which apparently we have proof that it does. + (LP: #348428) (Reopen 344740) + + -- Bryce Harrington Fri, 03 Apr 2009 20:03:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu4) jaunty; urgency=low + + * Add 117_quirk_thinkpad_x30.patch: + - Pipe-A quirk to fix lid close freeze on Thinkpad X30 + (LP: #304614) + * Add 118_drop_legacy3d.patch: + - Remove Legacy3D as a user-configurable option and force fallback to + legacy fixed textures when GEM is not being used. Fixes "couldn't + bind memory for BO backbuffer" issue on at least i855 chipsets. + (LP: #322646) + + -- Bryce Harrington Wed, 01 Apr 2009 00:25:55 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu3) jaunty; urgency=low + + * Add 116_865g_disable_dri.patch: + - On 865G chipset, X freezes during boot with DRI enabled. Disabling it + as a workaround until a better fix is found. + (LP: #317457) + * Drop explicit dependency on libdrm-intel1, as libdrm now provides + this properly (libdrm2 commit a87c1a081b77a29fe3430d). + + -- Bryce Harrington Tue, 31 Mar 2009 18:36:00 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu2) jaunty; urgency=low + + * Add 114_fix_xv_with_non_gem.patch, 115_fix_crash_xv_overlay.patch: + - Fix green window when playing movies with Xv extension (LP: #344740) + + -- Bryce Harrington Wed, 18 Mar 2009 17:05:09 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu1) jaunty; urgency=low + + * New upstream release: + - Access the Xv buffer through the GTT for the non-KMS case. + - Fix i915 textured video to work with the i830_memory -> bo change. + - Make i830_allocate_memory take tiling parameters. + - Fixup bogus VBT when detected. Causes incorrect video modes for + several Dell and Sony machines. + - Various KMS, BOs, UXA, and DRI2 fixes + - Various new hw quirks + * Add ChangeLog not included in upstream tarball (else FTBS) + * Add 112_num_used_fences.patch: Work around FTBS due to missing kernel + header changes (from drm commit 0f973f27888e4664b253ab2cf69c67c2eb80ab1b) + * debian/control: Update libdrm2 dependency to 2.4.5 + * Drop patches applied upstream: + - 104_i830-vbt-timing-hack.patch + - 108_dont_disable_vga_centering_bit.patch + - 111_quirks_march4_sync.patch (Fixes LP: #343577) + * Refresh 107_remove_pageflipping.diff to apply + + -- Bryce Harrington Tue, 17 Mar 2009 13:34:59 -0700 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu5) jaunty; urgency=low + + * Add 111_quirks_march4_sync.patch: Cherrypick from upstream's quirks + - Fix LVDS issues on MSI IM-945GSE-A and all GM45 chips + - Fix lid close issue on Mirrus Centrino laptop + - Fix tv-out issue on HP Compaq nx6310 systems + + -- Bryce Harrington Wed, 04 Mar 2009 14:46:30 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu4) jaunty; urgency=low + + * Add 110_quirk_hp_mini.patch: Pipe-A quirk for an HP Mini + * Renumber patch 02_i830-fifo-watermark-conservative.patch to + 109_i830-fifo-watermark-conservative.patch + + -- Bryce Harrington Mon, 02 Mar 2009 21:52:04 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu3) jaunty; urgency=low + + * Add 02_i830-fifo-watermark-conservative.patch: Avoid pipe underruns on + high graphics activity, which caused flicker and sometimes complete screen + corruption. (LP: #311895, fd.o #19304) + + -- Martin Pitt Wed, 25 Feb 2009 08:26:35 +0100 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu2) jaunty; urgency=low + + * Add 108_dont_disable_vga_centering_bit.patch. Cherry-pick from + upstream commit 3aa8591abfbe8db0f13912910c850fdd748808df. + Don't disable vga centering bit. Causes failure to display + lower resolutions on Eee PCs, etc. + (LP: #324913) + + -- Bryce Harrington Mon, 09 Feb 2009 15:20:29 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu1) jaunty; urgency=low + + * Merge with Debian experimental, remaining changes: + - debian/control: + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + 103_quirk_intel_mb890.patch + Add ignore lvds quirk for mb890 motherboards to fix issue where + display shows all in one color. (LP: 305269) + + 104_i830-vbt-timing-hack.patch + Adjust h and vblank end to fix issue on Dell Studio 15 and + other similar hardware. Fixes issue where X comes up with an + unusable white screen on the LVDS. (LP: 297245) + * Add 105_no_modesetting.diff + - 2.6.28 doesn't ship drm headers that support modesetting, so + disable it for the driver to build. + * Add 106_remove_triple_buffering.diff + - Obsolete code, prerequisite for the next patch. + * Add 107_remove_pageflipping.diff + - Remove pageflipping support. It never got in the kernel drm code, + so without this the build fails. + + -- Timo Aaltonen Fri, 23 Jan 2009 10:41:27 +0200 + +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-1ubuntu9) jaunty; urgency=low + + * i830-vbt-timing-hack.patch: Adjust h and vblank end to fix issue on + Dell Studio 15 and other similar hardware. Fixes issue where X + comes up with an unusable white screen on the LVDS. + (LP: #297245) + + -- Bryce Harrington Tue, 13 Jan 2009 16:18:19 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu8) jaunty; urgency=low + + * 103_quirk_intel_mb890.patch: Add ignore lvds quirk for mb890 + motherboards to fix issue where display shows all in one color. + (LP: #305269) + + -- Bryce Harrington Tue, 13 Jan 2009 00:01:48 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu7) jaunty; urgency=low + + * Also add lpia in the Architecture list of the -dbg package to clear it off + jaunty_outdate.txt (we have the -dbg on other arches anyway). + + -- Loic Minier Sat, 20 Dec 2008 21:38:09 +0100 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu6) jaunty; urgency=low + + * Rebuild against the new xserver + + -- Timo Aaltonen Mon, 15 Dec 2008 10:19:55 +0200 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu5) jaunty; urgency=low + + * Add explicit Depends for libdrm-intel1 (LP: #303177) + + -- Bryce Harrington Fri, 05 Dec 2008 20:03:20 +0000 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu4) jaunty; urgency=low + + * Drop 111_textured_video_option.patch. XvPreferOverlay (commit + 24c34f02) now provides an equivalent capability for turning textured + video off, making this patch redundant. + + -- Bryce Harrington Tue, 02 Dec 2008 12:47:10 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu3) jaunty; urgency=low + + * 102_quirk_hp_2730p.patch: pipea quirk for hp 2730p (LP: #291555) + + -- Bryce Harrington Tue, 02 Dec 2008 11:47:28 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu2) jaunty; urgency=low + + * Drop 128_stolen_memory_counting_g4x.patch (already upstream) + * Refresh and re-enable 111_textured_video_option.patch + + -- Bryce Harrington Tue, 02 Dec 2008 09:13:34 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu1) jaunty; urgency=low + + * Merge with debian experimental. Remaining changes: + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + Renumber Ubuntu patches +100 + + 101_quirk_quanta_w251u.patch + + 111_textured_video_option.patch (disabled) + + 128_textured_video_option.patch (disabled) + * Drop 01_fix_compiz_video.diff. Was already disabled in Ubuntu previously + * Drop 05_intel_exa_force_greedy.patch. Should no longer be necessary. + * Drop patches already upstream: + - 20_thinkpad_g40_quirk.patch + - 21_quirk_lenovo.patch + - 22_no_pipe_for_hotplug_detection.patch + - 23_quirks_studiohybrid_eeepc_and_w251u.patch + - 24_no_render_suspend + - 25_quirk_nc6110.patch + - 26_i830-use-lfp-data-ptrs.patch + - 27_disable_fbc_on_965.patch + + -- Bryce Harrington Thu, 27 Nov 2008 10:46:18 -0800 + +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-1ubuntu11) jaunty; urgency=low + + * Re-enable 11_textured_video_option.patch, but change logic so it is + enabled by default. This allows people seeing issues with it to + turn it off if they wish. (LP: #278318) + + -- Bryce Harrington Fri, 14 Nov 2008 14:55:33 -0800 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10) intrepid; urgency=low + + * 28_stolen_memory_counting_g4x.patch: + - Fixes freeze on login for G45 hardware when X.org runs in EXA mode. + Issue was fixed upstream in both the kernel and x driver. This + patch is also in Debian. + (LP: #285572) + + -- Bryce Harrington Tue, 21 Oct 2008 11:35:13 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu9) intrepid; urgency=low + + * 27_disable_fbc_on_965.patch: + - Works around issue where flash videos freeze after playing for a few + moments on i965 chipset, by disabling Frame Buffer Compression, which + is not working reliably on this chipset. It can be re-enabled via the + FrameBufferCompression option for testing purposes. + (LP: #275285) + + -- Bryce Harrington Fri, 17 Oct 2008 18:11:03 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu8) intrepid; urgency=low + + * 26_i830-use-lfp-data-ptrs.patch: + - Fixes fatal server error "Couldn't find PLL settings for mode" + on a 855GM chipset, due to having an inaccurate VBT LFP_DATA + section from the BIOS parser. This pulls the info from a + different (more trustworthy) version of the data structure. + (LP: #274045) + + -- Bryce Harrington Thu, 16 Oct 2008 12:38:19 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu7) intrepid; urgency=low + + * Drop Vcs-* as we're not using these repos for -intel. + + -- Loic Minier Wed, 15 Oct 2008 13:24:36 +0200 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu6) intrepid; urgency=low + + * 25_quirks_nx6110.patch: + - Fixes error msg that "Mode 1280x1024 does not fit virtual size" + (LP: #271707) + + -- Bryce Harrington Sat, 20 Sep 2008 18:20:56 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu5) intrepid; urgency=low + + * 24_no_render_suspend: + - Fix blank screen and crash on startup with x4500 (LP: #265119) + + -- Christopher James Halse Rogers (RAOF) Fri, 19 Sep 2008 14:00:28 +1000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu4) intrepid; urgency=low + + * 23_quirks_studiohybrid_eeepc_and_w251u.patch: + - Fix blank screen on startup on Asus Eee PC due to LVDS + misconfiguration (LP: #233787) + - Fix blank screen on startup on Dell Studio Hybrid due to LVDS + misconfiguration (LP: #267945) + - Fix crash on lid close on Gigabyte W251U - pipeA quirk (LP: #244242) + + -- Bryce Harrington Fri, 12 Sep 2008 00:53:01 +0000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu3) intrepid; urgency=low + + * Rebuild against the new xserver-xorg-dev. + + -- Timo Aaltonen Fri, 12 Sep 2008 01:09:40 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu2) intrepid; urgency=low + + * 22_no_pipe_for_hotplug_detection.patch: Don't allocate a pipe for + hotplug detection. (LP: #256142) + + -- Timo Aaltonen Tue, 02 Sep 2008 16:13:52 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu1) intrepid; urgency=low + + * New upstream version, this is basically version 2.4.2. (LP: #260603) + * Merge with debian experimental. Remaining changes: + - debian/patches + + 20_thinkpad_g40_quirk.patch: + Quirk for IBM Thinkpad G40 + + 21_quirk_lenovo.patch: + Pipe-A quirks for Lenovo ThinkPad T60 + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + * Disable 01_fix_compiz_video.diff, since it appears to be obsolete + by now. + * Drop 05_intel_exa_force_greedy.patch, since it was not used (crash) + and the option doesn't seem to improve the performance anymore. + * Disable 11_textured_video_option.patch for now, textured video seems + to work just fine now. + + -- Timo Aaltonen Tue, 26 Aug 2008 14:19:55 +0300 + +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-1ubuntu1) intrepid; urgency=low + + * Merge with debian experimental. + * 20_thinkpad_g40_quirk.patch: don't remove another quirk, must've been + a mistake (and not related to G40). + * 21_quirk_lenovo.patch: rename and drop the HP quirk, since it's + upstream. + * rules: drop the change to not build intel_reg_dumper, libpciaccess is + in main now. + * changelog: bring back old entries lost during an old merge (ahem..). + * Fixes from upstream 2.4-branch: + 30_update_dsparb.patch + - Update DSPARB while planes are still off. + 31_reorder_visuals.patch + - Reorder visuals reported by the intel driver. + 32_dont_program_dsparb.patch + - Don't program dsparb on new Intel chip. + 33_fix_hp_pavilion_quirk.patch + - Fix up the HP Pavilion ze4944ea quirk. The chip is 855GM, not GM45. + + -- Timo Aaltonen Thu, 07 Aug 2008 14:38:09 +0300 + +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-2ubuntu3) intrepid; urgency=low + + * Remove 19_check_exa_pitch_to_fix_rotate_crash.patch, fixed upstream + using a different approach. (LP: #246835) + + -- Timo Aaltonen Wed, 09 Jul 2008 15:31:08 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu2) intrepid; urgency=low + + * Disable 05_intel_exa_force_greedy.patch, since it makes the driver + to segfault the xserver. (LP: #246581) + + -- Timo Aaltonen Tue, 08 Jul 2008 18:31:22 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + + debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + 21_quirk_lenovo_and_hp_pavilion.patch: Pipe-A quirks for Lenovo + ThinkPad T60 (LP: #243405) and HP Pavilion ze4944ea (LP: #242389) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Mon, 07 Jul 2008 21:10:38 -0700 + +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-1ubuntu3) intrepid; urgency=low + + * debian/patches/21_quirk_lenovo_and_hp_pavilion.patch: + + Quirk for fixing lockup on lid close for the Lenovo ThinkPad T60 + (LP: #243405) + + Quirk for fixing lockup on lid close for the HP Pavilion ze4944ea + (LP: #242389) + + -- Bryce Harrington Thu, 26 Jun 2008 20:36:29 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu2) intrepid; urgency=low + + * debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + -- Bryce Harrington Fri, 20 Jun 2008 22:48:30 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Thu, 19 Jun 2008 22:36:51 -0700 + +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-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + * 11_textured_video_option.patch: + - Renamed and reworked version of the old 11_hw_overlay_option.diff + patch, to re-enable the textured video option, to allow users to + turn off textured video. + * Dropped patches that are now upstream + * Restore Debian's Conflicts/Replaces for -i810 and symlink i810 to + intel. We are now following suit to Debian and X.org and fully + deprecating the i810 driver and with 915resolution with this + release; remaining issues requiring use of the i810 driver need to + be reported to Launchpad and upstream so they can finally all get + fixed. + + -- Bryce Harrington Fri, 06 Jun 2008 19:34:28 -0700 + +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-2ubuntu2) intrepid; urgency=low + + * 20_dpll_prg_in_crtc_mode_set.patch: + - Fixes display problems caused by Jesse's force pipe A enablement + patch, which breaks DPLL programming. + + -- Bryce Harrington Wed, 28 May 2008 15:30:31 -0700 + +xserver-xorg-video-intel (2:2.2.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + + 08_945gm_quirk.diff: + Adds quirk for another laptop model with a tv out detection bug. + (LP: 152416) + + 10_hw_overlay.diff: + Replace explicit checks for G965 for having no overlay since it + has one, with general check for future chips that may have no + overlay. (LP: 201596, 152206) + + 11_hw_overlay_option.diff: + Add a Boolean "TexturedVideo" option with default 'true' value + to be able to turn textured video off. + (LP: 201596, 152206) + + 12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: 197740) + + 13_dpms_low_power_overlay.patch: + Fix crash triggered by dpms low power mode with hardware overlay + running (LP: 160309) + + 14_sysfs_fujitsu_backlight.patch: + Add sysfs backlight support for Fujitsu laptops (LP: 197620) + + 15_quirk_sony_vaio_vgn-sz4mn.patch: + Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: 212163) + + 16_legacy_backlight_blc_pwn_ctl.patch: + Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to + BCM_COMBO. (LP: 201933) + + 17_lockup_virtual_size_2048.patch: + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (LP: 188178) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Nuke Conflicts and Replaces related to -i810. + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + Don't conflict with 915resolution, since it breaks upgrades + where people are still using i810 with widescreen resolutions. + (LP: 206167) + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to + coexist until -intel is able to replace it completely. + * debian/patches/18_quirks.patch: + - Add quirks for pipe A and tv output bugs. + (Closes LP: #204603, #216490, #201257, #224102) + * debian/patches/19_check_exa_pitch_to_fix_rotate_crash.patch: + - Fixes crash on xrandr rotation by checking EXA pitch size. + EXA wasn't checking devKind in ModifyPixmapHeader, which + makes it impossible to check homemade pixmaps (like produced + by rotate_pixmap(). So this patch checks in all !965 cases now. + 965G supports max pitch for current exa limit (128k) so doesn't + need checks. (Closes LP: #174745) + * debian/rules: + - Drop dpkg-shlibdeps with --warnings=6 (FTBS), sounds just cosmetic + + -- Bryce Harrington Fri, 09 May 2008 00:22:45 -0700 + +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-1ubuntu12) hardy; urgency=low + + * debian/patches/17_lockup_virtual_size_2048.patch: + - merging patch from http://bugs.freedesktop.org/show_bug.cgi?id=13376. + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (closes LP: #188178) + + -- Emmanuel Bretelle Sat, 29 Mar 2008 14:06:49 +0000 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu11) hardy; urgency=low + + * debian/patches/16_legacy_backlight_blc_pwn_ctl.patch: + - Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to BCM_COMBO. + This won't affect users using the kernel's /sys/class/backlight + interfaces for managing the backlight, but should produce better + results for the majority of legacy bit users. (LP: #201933) + + -- Bryce Harrington Mon, 07 Apr 2008 23:41:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu10) hardy; urgency=low + + * debian/patches/15_quirk_sony_vaio_vgn-sz4mn.patch: + - Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: #212163) + + -- Bryce Harrington Sat, 05 Apr 2008 13:00:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu9) hardy; urgency=low + + * debian/patches/14_sysfs_fujitsu_backlight.patch: + - Add sysfs backlight support for Fujitsu laptops (LP: #197620) + + -- Bryce Harrington Fri, 04 Apr 2008 20:02:03 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu8) hardy; urgency=low + + * debian/patches/13_dpms_low_power_overlay.patch: + - Fix crash triggered by dpms low power mode with hardware overlay + running (LP: #160309) + + -- Bryce Harrington Fri, 04 Apr 2008 16:33:51 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu7) hardy; urgency=low + + * debian/patches/12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: #197740) + + -- Bryce Harrington Fri, 04 Apr 2008 14:02:07 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu6) hardy; urgency=low + + [ Bryce Harrington ] + * debian/patches/05_intel_exa_force_greedy.patch: Another shot at the + greedy patch. This time by slightly modifying the working patch by + moving its logic outside the i965 if loop, so it'll apply to all + hardware. (LP: #177492) + + [ Timo Aaltonen ] + * Don't conflict with 915resolution, since it breaks upgrades where + people are still using i810 with widescreen resolutions. + (LP: #206167) + + -- Timo Aaltonen Tue, 25 Mar 2008 11:25:42 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu5) hardy; urgency=low + + * Fix the overlay patch to really disable TexturedVideo by default. + (LP: #201596) + + -- Timo Aaltonen Fri, 14 Mar 2008 11:01:09 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu4) hardy; urgency=low + + * Revert the greedy change, use the old patch again since the new one + doesn't work right. (LP: #177492) + * Add patches to enable hardware overlay for i965, and disable textured + video by default. It can be enabled again by setting + 'Option "TexturedVideo" "true"'. (LP: #152206) + + -- Timo Aaltonen Tue, 11 Mar 2008 21:42:43 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu3) hardy; urgency=low + + * Add 07_intel_exa_force_all_greedy.patch, to expand the fix from + 05_intel_exa_force_greedy.patch to cover all Intel chipsets, not just + 965. (LP: #177492) + * Drop 05_intel_exa_force_greedy.patch, since 07 is a superset of it. + * Add 08_945gm_quirk.diff, to add quirk for another laptop model with a + tv out detection bug. (LP: #152416) + + -- Bryce Harrington Fri, 29 Feb 2008 15:52:16 -0800 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu2) hardy; urgency=low + + * Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + -- Timo Aaltonen Wed, 27 Feb 2008 00:04:15 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #189868, #195424), remaining + changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Tue, 26 Feb 2008 14:04:11 +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-2ubuntu7) hardy; urgency=low + + * Drop the xaa-patch, as it turns out that not only i965 has issues + with Xv & compiz. + * Bump the build-dep on xserver-xorg-dev to match the current version + that is needed in order to default to greedy EXA. + + -- Timo Aaltonen Thu, 21 Feb 2008 09:00:53 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu6) hardy; urgency=low + + * Add 06_xaa_as_default_except_i965.patch to switch us back to XAA by + default for intel chipsets for performance reasons, except for i965 + which does not work as well with XAA (Xv video doesn't display + properly.) This patch essentially just reverts upstream's 'Default to + EXA' patch, and adds a special case i965 to allow it to use EXA. + + -- Bryce Harrington Tue, 19 Feb 2008 14:27:18 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu5) hardy; urgency=low + + * Add 05_intel_exa_force_greedy.patch to force use of greedy mode on + i965 hardware. (closes LP: #177492, #148247, #152206) + + -- Bryce Harrington Tue, 19 Feb 2008 13:48:02 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu4) hardy; urgency=low + + * 04_dell_1735_quirk.patch: Another HDMI port quirk, for the Dell + Inspiron 1735. (LP: #188204) + + -- Bryce Harrington Thu, 14 Feb 2008 18:08:47 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu3) hardy; urgency=low + + * 03_dell_1535_quirk.patch: Add a quirk for Dell Inspiron 1535 so it + does not configure against the HDMI port instead of the LCD's native + resolution (LP: #187860). + + -- Bryce Harrington Thu, 14 Feb 2008 15:52:01 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu2) hardy; urgency=low + + * 02_quick_fix.patch: Patch from upstream to prevent a crash on start. + + -- Timo Aaltonen Wed, 06 Feb 2008 19:04:04 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop 05_fix_xv_reset.diff, different implementation upstream. + + -- Timo Aaltonen Wed, 06 Feb 2008 18:03:24 +0200 + +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-1ubuntu2) hardy; urgency=low + + * 10_merge_upstream.diff: + - Merge all upstream commits from the stable branch up to commit + 103dc34f3afc17cea7e086927e124a30c605a686 + * 02_force_16bit_i81x.diff + - Dropped, upstream now. + + -- Timo Aaltonen Tue, 29 Jan 2008 12:58:37 +0200 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * debian/patches/02_force_16bit_i81x.diff: + - Force 16bit depth on i81{0,5} chips (LP: #178837) + + -- Timo Aaltonen Tue, 08 Jan 2008 17:22:38 +0200 + +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-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + - These patches have been disabled for now, since they don't apply + fully and need closer investigation: + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen Sat, 24 Nov 2007 19:35:11 +0200 + +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-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop patches 02, 06, 08 which have been merged upstream. + * These patches have been disabled for now, since they don't apply fully + and need closer investigation: + - 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + - 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + - 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen Thu, 15 Nov 2007 00:12:47 +0200 + +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-4ubuntu2) hardy; urgency=low + + * Duh, really nuke the i810 manpage conflict. + + -- Timo Aaltonen Thu, 08 Nov 2007 18:52:43 +0200 + +xserver-xorg-video-intel (2:2.1.1-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 02_xps1330_tvout_quirk.diff: + add quirk, xps1330 has no tv out + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + + 06_sync_quirks.diff: + Sync TV out quirks with upstream + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + 08_fix_855_3D_state.diff + Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Thu, 08 Nov 2007 08:53:28 +0200 + +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.1-0ubuntu10) hardy; urgency=low + + [ Bryce Harrington ] + [Peter Clifton] + * 08_fix_855_3D_state.diff + - Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + (Closes LP: #133118) + * 07_fix_startup_blink.diff + - Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + (Closes LP: #148686) + * 04_fix_hw_restore.diff + - Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + (Closes LP: #108056) + + [Kyle McMartin, Bryce Harrington] + * 06_sync_quirks.diff: + - Sync TV out quirks with upstream + + -- Timo Aaltonen Thu, 01 Nov 2007 21:44:36 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu9) gutsy; urgency=low + + [Peter Clifton] + * 01_fix_compiz_video.diff: + - Bracket second clause in test for textured video to avoid + compiler warning and possibly incorrect testing. + * 04_fix_hw_restore.diff + - Only restore palette registers for pipes which are enabled, or + the system may hard-lock. (Initial patch by Bryce Harrington). + (Closes LP: #127101) + * 05_fix_xv_reset.diff + - Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + (Closes LP: #141063) + + -- Bryce Harrington Sat, 13 Oct 2007 12:58:07 -0700 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu8) gutsy; urgency=low + + * Brown paper bag release. + * Uncomment dh_installchangelogs. + + -- Kyle McMartin Thu, 11 Oct 2007 13:05:43 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu7) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Nuke, caused graphics corruption on G33, reverted kernel code. + + -- Kyle McMartin Tue, 09 Oct 2007 09:51:18 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu6) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Latest kernel release changes how stolen mem range is computed on + G33 hardware, needs this corresponding X change otherwise we die + trying to allocate GART memory. + + -- Kyle McMartin Sat, 06 Oct 2007 10:01:17 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu5) gutsy; urgency=low + + * 03_fix_brightness_control.diff: + - add code from upstream to avoid confusing the platform firmware + brightness control + + -- Matthew Garrett Thu, 04 Oct 2007 00:09:54 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu4) gutsy; urgency=low + + * 02_xps1330_tvout_quirk.diff: + - add quirk, xps1330 has no tv out + + -- Kyle McMartin Fri, 28 Sep 2007 09:45:48 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu3) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - default to overlay mode on hardware that supports it to + make compiz video work + + -- Michael Vogt Tue, 18 Sep 2007 09:48:45 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu2) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + -- Michael Vogt Tue, 14 Aug 2007 21:46:28 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu1) gutsy; urgency=low + + * New upstream version. + * Drop ChangeLog since it isn't updated upstream and is just + needless diff. + + -- Kyle McMartin Tue, 14 Aug 2007 02:38:09 -0400 + +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-1ubuntu2) gutsy; urgency=low + + * Add lpia to the list of architectures. + + -- Matthias Klose Tue, 07 Aug 2007 13:12:48 +0000 + +xserver-xorg-video-intel (2:2.1.0-1ubuntu1) gutsy; urgency=low + + [ Kyle McMartin ] + + * Merge changes from 2.0.0-1ubuntu2. + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 03 Jul 2007 12:45:17 -0400 + +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-1ubuntu2) gutsy; urgency=low + + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 22 May 2007 18:53:04 +0000 + +xserver-xorg-video-intel (2:2.0.0-1ubuntu1) gutsy; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control: + + Stop building the transitional xserver-xorg-video-i810, so that + it doesnt overwrite the identically-named package in main + + Replace and Conflict xserver-xorg-driver-i810. + + Change Maintainer address. + + -- Timo Aaltonen Mon, 21 May 2007 12:54:24 +0300 + +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-1ubuntu3) feisty; urgency=low + + * Stop building the transitional xserver-xorg-video-i810, so that it doesnt + overwrite the identically-named package in main + + -- Sarah Hobbs Tue, 17 Apr 2007 15:10:03 +1000 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu2) feisty; urgency=low + + * src/ch7017/Makefile.{am,in} + - [FTBFS] Fix AM_CFLAGS to include '-I$(srcdir)/..' and + '-I$(srcdir)/../modes'. + + -- Timo Aaltonen Mon, 16 Apr 2007 15:47:59 +0300 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu1) feisty; urgency=low + + * Merge with Debian, remaining changes: + debian/control + - Change the Maintainer address. + - Replace and Conflict xserver-xorg-driver-i810 + - Ease the dependancy on xserver-xorg-dev. + debian/rules: + - Add '--with-xserver-source=/' so configure uses the included headers. + + -- Timo Aaltonen Wed, 4 Apr 2007 00:15:30 +0300 + +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.14.0.orig/debian/xserver-xorg-video-intel.udev +++ xserver-xorg-video-intel-2.14.0/debian/xserver-xorg-video-intel.udev @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +# Jesse Barnes on ubuntu-devel@lists.ubuntu.com: +# You'll get three events, one when the error is detected, one before the +# reset and one after. Each has a different environment variable set; the +# initial error has ERROR=1, the pre-reset event has RESET=1 and the +# post-reset event has ERROR=0. + +# Disable freeze hook. +SUBSYSTEM=="drm", ACTION=="change", ENV{ERROR}=="1", RUN+="/usr/share/apport/apport-gpu-error-intel.py" --- xserver-xorg-video-intel-2.14.0.orig/debian/README.source +++ xserver-xorg-video-intel-2.14.0/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.14.0.orig/debian/README.Debian +++ xserver-xorg-video-intel-2.14.0/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.14.0.orig/debian/patches/series +++ xserver-xorg-video-intel-2.14.0/debian/patches/series @@ -0,0 +1,12 @@ +# placeholder + +# Ubuntu patches +101_copy-fb.patch +107_solid_nullptr_check.patch +109_dont_reconstruct_glyph_cache_on_rotate.patch +110_warnings_cleanup.patch +111_fix_clipped_window_plane_offset.patch +112_fix_error_in_4c4ad555.patch +113_remove_broken_max_base_addresses.patch +114_warnings_cleanup_part_2.patch +115_quell_vblank_counter_failed.patch --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/114_warnings_cleanup_part_2.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/114_warnings_cleanup_part_2.patch @@ -0,0 +1,115 @@ +From ae8877e30707cae586565b4deee4c7fd9ac7d3ed Mon Sep 17 00:00:00 2001 +From: Cyril Brulebois +Date: Mon, 31 Jan 2011 05:22:35 +0000 +Subject: xvmc: Get rid of unused variables. + +Signed-off-by: Cyril Brulebois +Signed-off-by: Chris Wilson +--- +diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c +index 21a1149..fbd4555 100644 +--- a/src/xvmc/i915_xvmc.c ++++ b/src/xvmc/i915_xvmc.c +@@ -391,7 +391,6 @@ static void i915_mc_static_indirect_state_set(XvMCContext * context, + i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; + struct intel_xvmc_surface *intel_surf = dest->privData; + struct i915_mc_static_indirect_state_buffer *buffer_info; +- unsigned int w = dest->width; + + drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo); + buffer_info = pI915XvMC->sis_bo->virtual; +@@ -688,7 +687,7 @@ static void i915_mc_load_indirect_render_emit(XvMCContext * context) + { + i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; + int mem_select; +- uint32_t load_indirect, buffer_address; ++ uint32_t load_indirect; + BATCH_LOCALS; + + BEGIN_BATCH(5); +diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c +index 337b2ce..2b5526c 100644 +--- a/src/xvmc/intel_batchbuffer.c ++++ b/src/xvmc/intel_batchbuffer.c +@@ -64,8 +64,6 @@ static void i965_end_batch(void) + + Bool intelInitBatchBuffer(void) + { +- int i; +- + if ((xvmc_driver->batch.buf = + drm_intel_bo_alloc(xvmc_driver->bufmgr, + "batch buffer", BATCH_SIZE, 0x1000)) == NULL) { +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index 6cbec80..339c133 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -105,8 +105,6 @@ unsigned int mb_bytes_420[] = { + + void LOCK_HARDWARE(drm_context_t ctx) + { +- char __ret = 0; +- + PPTHREAD_MUTEX_LOCK(); + assert(!xvmc_driver->locked); + +@@ -218,11 +216,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port, + int error_base; + int event_base; + int priv_count; +- int isCapable; +- int screen = DefaultScreen(display); +- intel_xvmc_context_ptr intel_ctx; +- int fd; +- char *driverName = NULL, *deviceName = NULL; + + /* Verify Obvious things first */ + if (!display || !context) +@@ -482,7 +475,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, + unsigned int num_blocks, + XvMCBlockArray * block) + { +- Status ret; + if (!display || !context || !num_blocks || !block) + return BadValue; + +@@ -505,7 +497,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, + */ + _X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block) + { +- Status ret; + if (!display || !block) + return BadValue; + +@@ -679,7 +670,6 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface, + _X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface) + { + Status ret; +- int stat = 0; + + if (!display || !surface) + return XvMCBadSurface; +@@ -739,9 +729,6 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface, + */ + _X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface) + { +- int stat = 0; +- Status ret; +- + if (!display || !surface) + return XvMCBadSurface; + +diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c +index addc7c9..d72e105 100644 +--- a/src/xvmc/xvmc_vld.c ++++ b/src/xvmc/xvmc_vld.c +@@ -785,7 +785,6 @@ static Status begin_surface(Display * display, XvMCContext * context, + XvMCSurface * future, + const XvMCMpegControl * control) + { +- struct i965_xvmc_contex *i965_ctx; + struct intel_xvmc_surface *priv_target, *priv_past, *priv_future; + intel_xvmc_context_ptr intel_ctx = context->privData; + Status ret; +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/115_quell_vblank_counter_failed.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/115_quell_vblank_counter_failed.patch @@ -0,0 +1,80 @@ +diff --git a/src/intel_dri.c b/src/intel_dri.c +index 7b60e14..65c8f39 100644 +--- a/src/intel_dri.c ++++ b/src/intel_dri.c +@@ -1057,10 +1057,14 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc) + + ret = drmWaitVBlank(intel->drmSubFD, &vbl); + if (ret) { +- xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "%s:%d get vblank counter failed: %s\n", +- __FUNCTION__, __LINE__, +- strerror(errno)); ++ static int limit = 5; ++ if (limit) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "%s:%d get vblank counter failed: %s\n", ++ __FUNCTION__, __LINE__, ++ strerror(errno)); ++ limit--; ++ } + return FALSE; + } + +@@ -1113,10 +1117,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc, + vbl.request.sequence = 0; + ret = drmWaitVBlank(intel->drmSubFD, &vbl); + if (ret) { +- xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "%s:%d get vblank counter failed: %s\n", +- __FUNCTION__, __LINE__, +- strerror(errno)); ++ static int limit = 5; ++ if (limit) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "%s:%d get vblank counter failed: %s\n", ++ __FUNCTION__, __LINE__, ++ strerror(errno)); ++ limit--; ++ } + goto out_complete; + } + +@@ -1143,10 +1151,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc, + vbl.request.signal = (unsigned long)wait_info; + ret = drmWaitVBlank(intel->drmSubFD, &vbl); + if (ret) { +- xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "%s:%d get vblank counter failed: %s\n", +- __FUNCTION__, __LINE__, +- strerror(errno)); ++ static int limit = 5; ++ if (limit) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "%s:%d get vblank counter failed: %s\n", ++ __FUNCTION__, __LINE__, ++ strerror(errno)); ++ limit--; ++ } + goto out_complete; + } + +@@ -1178,10 +1190,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc, + vbl.request.signal = (unsigned long)wait_info; + ret = drmWaitVBlank(intel->drmSubFD, &vbl); + if (ret) { +- xf86DrvMsg(scrn->scrnIndex, X_WARNING, +- "%s:%d get vblank counter failed: %s\n", +- __FUNCTION__, __LINE__, +- strerror(errno)); ++ static int limit = 5; ++ if (limit) { ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "%s:%d get vblank counter failed: %s\n", ++ __FUNCTION__, __LINE__, ++ strerror(errno)); ++ limit--; ++ } + goto out_complete; + } + --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/112_fix_error_in_4c4ad555.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/112_fix_error_in_4c4ad555.patch @@ -0,0 +1,33 @@ +From 5baa63c634990810a66c3150b4f2b76fcee2df38 Mon Sep 17 00:00:00 2001 +From: Xiang, Haihao +Date: Fri, 21 Jan 2011 00:45:52 +0000 +Subject: Fix an error in 4c4ad555564a80311df1a4b762eb1e119c6d95fb. + +See the original patch at https://bugs.freedesktop.org/show_bug.cgi?id=24767 + +Signed-off-by: Xiang, Haihao +--- +diff --git a/src/intel_video.c b/src/intel_video.c +index 0d1ffc5..5294f73 100644 +--- a/src/intel_video.c ++++ b/src/intel_video.c +@@ -996,7 +996,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, + /* Copy V data for YV12, or U data for I420 */ + src2 = buf + /* start of YUV data */ + (srcH * srcPitch) + /* move over Luma plane */ +- ((top >> 1) * srcPitch) + /* move down from by top lines */ ++ ((top >> 1) * srcPitch2) + /* move down from by top lines */ + (left >> 1); /* move left by left pixels */ + + #if 0 +@@ -1015,7 +1015,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, + src3 = buf + /* start of YUV data */ + (srcH * srcPitch) + /* move over Luma plane */ + ((srcH >> 1) * srcPitch2) + /* move over Chroma plane */ +- ((top >> 1) * srcPitch) + /* move down from by top lines */ ++ ((top >> 1) * srcPitch2) + /* move down from by top lines */ + (left >> 1); /* move left by left pixels */ + #if 0 + ErrorF("src3 is %p, offset is %ld\n", src3, +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/101_copy-fb.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/101_copy-fb.patch @@ -0,0 +1,202 @@ +Index: xserver-xorg-video-intel/src/intel.h +=================================================================== +--- xserver-xorg-video-intel.orig/src/intel.h 2011-01-31 17:55:53.348189809 +1100 ++++ xserver-xorg-video-intel/src/intel.h 2011-01-31 17:56:01.018201058 +1100 +@@ -472,6 +472,7 @@ + OptionInfoPtr Options; + + /* Driver phase/state information */ ++ Bool starting; + Bool suspended; + + enum last_3d last_3d; +@@ -501,6 +502,7 @@ + extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); + extern int intel_crtc_id(xf86CrtcPtr crtc); + extern int intel_output_dpms_status(xf86OutputPtr output); ++extern void intel_copy_fb(ScrnInfoPtr scrn); + + extern Bool intel_do_pageflip(intel_screen_private *intel, + dri_bo *new_front, +Index: xserver-xorg-video-intel/src/intel_display.c +=================================================================== +--- xserver-xorg-video-intel.orig/src/intel_display.c 2011-01-31 17:55:53.328189776 +1100 ++++ xserver-xorg-video-intel/src/intel_display.c 2011-01-31 17:56:01.018201058 +1100 +@@ -36,6 +36,8 @@ + #include + #include + ++#include ++ + #include "xorgVersion.h" + + #include "intel.h" +@@ -928,6 +930,13 @@ + drmModeConnectorPtr koutput = intel_output->mode_output; + struct intel_mode *mode = intel_output->mode; + int i; ++ intel_screen_private *intel = intel_get_screen_private(output->scrn); ++ ++ /* xf86Crtc.c calls dpms off in set desired modes, so ignore ++ * the request if we're starting up. */ ++ ++ if (intel->starting) ++ return; + + for (i = 0; i < koutput->count_props; i++) { + drmModePropertyPtr props; +@@ -1614,6 +1623,11 @@ + } + + intel->modes = mode; ++ ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 9 ++ scrn->canDoBGNoneRoot = TRUE; ++#endif ++ + return TRUE; + } + +@@ -1684,3 +1698,101 @@ + { + return crtc_id(crtc->driver_private); + } ++ ++static PixmapPtr ++intel_create_pixmap_for_fbcon(ScrnInfoPtr scrn) ++{ ++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); ++ struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; ++ ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex]; ++ struct intel_mode *mode = intel_crtc->mode; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ drmModeFBPtr fbcon = NULL; ++ struct drm_gem_flink flink; ++ drm_intel_bo *bo; ++ PixmapPtr pixmap = NULL; ++ int i; ++ ++ for (i = 0; i < mode->mode_res->count_crtcs; i++) { ++ intel_crtc = xf86_config->crtc[i]->driver_private; ++ if (intel_crtc->mode_crtc->buffer_id == 0) ++ continue; ++ fbcon = drmModeGetFB(mode->fd, ++ intel_crtc->mode_crtc->buffer_id); ++ if (fbcon != NULL) ++ break; ++ } ++ if (i == mode->mode_res->count_crtcs) ++ return NULL; ++ ++ flink.handle = fbcon->handle; ++ if (ioctl(mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Couldn't flink fbcon handle\n"); ++ return NULL; ++ } ++ ++ bo = drm_intel_bo_gem_create_from_name(intel->bufmgr, ++ "fbcon", flink.name); ++ if (bo == NULL) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Couldn't allocate bo for fbcon handle\n"); ++ return NULL; ++ } ++ if (!CreateScratchPixmapsForScreen(pScreen->myNum)) ++ return NULL; ++ ++ pixmap = GetScratchPixmapHeader(pScreen, ++ fbcon->width, fbcon->height, ++ fbcon->depth, fbcon->bpp, ++ fbcon->pitch, NULL); ++ if (pixmap == NULL) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Couldn't allocate pixmap fbcon contents\n"); ++ return NULL; ++ } ++ ++ intel_set_pixmap_bo(pixmap, bo); ++ drm_intel_bo_unreference(bo); ++ drmModeFreeFB(fbcon); ++ ++ return pixmap; ++} ++ ++void intel_copy_fb(ScrnInfoPtr scrn) ++{ ++ ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex]; ++ intel_screen_private *intel = intel_get_screen_private(scrn); ++ PixmapPtr src, dst; ++ unsigned int pitch = scrn->displayWidth * intel->cpp; ++ ++ src = intel_create_pixmap_for_fbcon(scrn); ++ if (src == NULL) { ++ xf86DrvMsg(scrn->scrnIndex, X_ERROR, ++ "Couldn't create pixmap for fbcon\n"); ++ return; ++ } ++ ++ /* We dont have a screen Pixmap yet */ ++ dst = GetScratchPixmapHeader(pScreen, ++ scrn->virtualX, scrn->virtualY, ++ scrn->depth, scrn->bitsPerPixel, ++ pitch, ++ NULL); ++ intel_set_pixmap_bo(dst, intel->front_buffer); ++ ++ intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); ++ ++ intel->uxa_driver->copy(dst, 0, 0, 0, 0, ++ scrn->virtualX, scrn->virtualY); ++ ++ intel->uxa_driver->done_copy(dst); ++ ++ intel_batch_emit_flush(scrn); ++ intel_batch_submit(scrn, TRUE); ++ ++ (*pScreen->DestroyPixmap)(src); ++ (*pScreen->DestroyPixmap)(dst); ++ FreeScratchPixmapsForScreen(pScreen->myNum); ++} ++ +Index: xserver-xorg-video-intel/src/intel_driver.c +=================================================================== +--- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-01-31 17:55:53.358189820 +1100 ++++ xserver-xorg-video-intel/src/intel_driver.c 2011-01-31 18:01:33.088688114 +1100 +@@ -1008,6 +1008,10 @@ + intel->directRenderingType = DRI_DRI2; + #endif + ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9 ++ screen->canDoBGNoneRoot = TRUE; ++#endif ++ + if (!intel_init_initial_framebuffer(scrn)) + return FALSE; + +@@ -1018,6 +1022,8 @@ + if (INTEL_INFO(intel)->gen >= 40) + gen4_render_state_init(scrn); + ++ intel->starting = FALSE; ++ + miClearVisualTypes(); + if (!miSetVisualTypes(scrn->depth, + miGetDefaultVisualMask(scrn->depth), +@@ -1153,6 +1159,7 @@ + + intel_mode_init(intel); + ++ intel->starting = FALSE; + intel->suspended = FALSE; + + #if HAVE_UDEV +@@ -1222,6 +1229,8 @@ + + intel_set_gem_max_sizes(scrn); + ++ intel_copy_fb(scrn); ++ + if (!xf86SetDesiredModes(scrn)) + return FALSE; + --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/107_solid_nullptr_check.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/107_solid_nullptr_check.patch @@ -0,0 +1,37 @@ +diff -Nurp xserver-xorg-video-intel-2.13.901//uxa/uxa-accel.c xserver-xorg-video-intel-2.13.901-working//uxa/uxa-accel.c +--- xserver-xorg-video-intel-2.13.901//uxa/uxa-accel.c 2010-09-28 20:43:10.000000000 -0700 ++++ xserver-xorg-video-intel-2.13.901-working//uxa/uxa-accel.c 2011-01-21 19:15:03.421218050 -0800 +@@ -120,6 +120,10 @@ uxa_fill_spans(DrawablePtr pDrawable, GC + + solid = uxa_acquire_solid(screen, src->pSourcePict); + FreePicture(src, 0); ++ if (!solid) { ++ FreePicture(dst, 0); ++ goto solid; ++ } + + src = solid; + src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, +@@ -1110,6 +1114,10 @@ try_solid: + + solid = uxa_acquire_solid(screen, src->pSourcePict); + FreePicture(src, 0); ++ if (!solid) { ++ FreePicture(dst, 0); ++ goto err; ++ } + + src = solid; + src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, +diff -Nurp xserver-xorg-video-intel-2.13.901//uxa/uxa-render.c xserver-xorg-video-intel-2.13.901-working//uxa/uxa-render.c +--- xserver-xorg-video-intel-2.13.901//uxa/uxa-render.c 2010-09-28 20:43:10.000000000 -0700 ++++ xserver-xorg-video-intel-2.13.901-working//uxa/uxa-render.c 2011-01-21 19:07:49.463951184 -0800 +@@ -1064,6 +1064,8 @@ try_solid: + int src_off_x, src_off_y; + + solid = uxa_acquire_solid(screen, src->pSourcePict); ++ if (! solid) ++ goto err_src; + FreePicture(src, 0); + + src = solid; --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/111_fix_clipped_window_plane_offset.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/111_fix_clipped_window_plane_offset.patch @@ -0,0 +1,33 @@ +From 4c4ad555564a80311df1a4b762eb1e119c6d95fb Mon Sep 17 00:00:00 2001 +From: Xiang, Haihao +Date: Wed, 19 Jan 2011 15:25:06 +0000 +Subject: Correct offset of planes within clipped window + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24767 +Reported-and-tested-by: Sitsofe Wheeler +Signed-off-by: Chris Wilson +--- +diff --git a/src/intel_video.c b/src/intel_video.c +index 2786201..0d1ffc5 100644 +--- a/src/intel_video.c ++++ b/src/intel_video.c +@@ -996,7 +996,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, + /* Copy V data for YV12, or U data for I420 */ + src2 = buf + /* start of YUV data */ + (srcH * srcPitch) + /* move over Luma plane */ +- ((top * srcPitch) >> 2) + /* move down from by top lines */ ++ ((top >> 1) * srcPitch) + /* move down from by top lines */ + (left >> 1); /* move left by left pixels */ + + #if 0 +@@ -1015,7 +1015,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, + src3 = buf + /* start of YUV data */ + (srcH * srcPitch) + /* move over Luma plane */ + ((srcH >> 1) * srcPitch2) + /* move over Chroma plane */ +- ((top * srcPitch) >> 2) + /* move down from by top lines */ ++ ((top >> 1) * srcPitch) + /* move down from by top lines */ + (left >> 1); /* move left by left pixels */ + #if 0 + ErrorF("src3 is %p, offset is %ld\n", src3, +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/108_undo_dmg_trans_before_append.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/108_undo_dmg_trans_before_append.patch @@ -0,0 +1,28 @@ +From da990536eca09c6de74627541cd56ecfad925eda Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Thu, 03 Feb 2011 09:41:48 +0000 +Subject: uxa: Undo damage translation before appending + +The region is used to paint onto the backing pixmap (and thus +translated) prior to being passed to the damage layer (wrt to the +drawable). So the local translation needs to be undone first. + +Identified by Christopher James Halse Rogers. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33650 +Signed-off-by: Chris Wilson +--- +diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c +index cf8b8ea..02bfa03 100644 +--- a/uxa/uxa-render.c ++++ b/uxa/uxa-render.c +@@ -1090,6 +1090,7 @@ try_solid: + /* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must + * manually append the damaged regions ourselves. + */ ++ pixman_region_translate(®ion, -dst_x, -dst_y); + DamageRegionAppend(dst->pDrawable, ®ion); + + pixman_region_fini(®ion); +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/116_scanlines_inclusive.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/116_scanlines_inclusive.patch @@ -0,0 +1,61 @@ +From fa0cd3d8df547622e4a46244e430b4776145de21 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Fri, 25 Mar 2011 10:46:14 +0000 +Subject: [PATCH] MI_LOAD_SCAN_LINES_INCL are inclusive and range [0, display height-1] + +We have seen GPU hangs with: + +batchbuffer at 0x0f9b4000: +0x0f9b4000: 0x09000000: MI_LOAD_SCAN_LINES_INCL +0x0f9b4004: 0x00000300: dword 1 +0x0f9b4008: 0x09000000: MI_LOAD_SCAN_LINES_INCL +0x0f9b400c: 0x00000300: dword 1 +0x0f9b4010: 0x01820000: MI_WAIT_FOR_EVENT +0x0f9b4014: HEAD 0x02000006: MI_FLUSH + +on a 1366x768 display. That according to the specs an invalid command +for the pipe. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35576 +Signed-off-by: Chris Wilson +--- + src/intel_dri.c | 4 ++-- + src/intel_video.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/intel_dri.c b/src/intel_dri.c +index 16e42f1..e0835c8 100644 +--- a/src/intel_dri.c ++++ b/src/intel_dri.c +@@ -497,10 +497,10 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, + */ + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | + load_scan_lines_pipe); +- OUT_BATCH((y1 << 16) | y2); ++ OUT_BATCH((y1 << 16) | y2-1); + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | + load_scan_lines_pipe); +- OUT_BATCH((y1 << 16) | y2); ++ OUT_BATCH((y1 << 16) | y2-1); + OUT_BATCH(MI_WAIT_FOR_EVENT | event); + ADVANCE_BATCH(); + } +diff --git a/src/intel_video.c b/src/intel_video.c +index 5294f73..f007918 100644 +--- a/src/intel_video.c ++++ b/src/intel_video.c +@@ -1358,9 +1358,9 @@ intel_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap, + /* The documentation says that the LOAD_SCAN_LINES command + * always comes in pairs. Don't ask me why. */ + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | pipe); +- OUT_BATCH((y1 << 16) | y2); ++ OUT_BATCH((y1 << 16) | y2-1); + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | pipe); +- OUT_BATCH((y1 << 16) | y2); ++ OUT_BATCH((y1 << 16) | y2-1); + OUT_BATCH(MI_WAIT_FOR_EVENT | event); + ADVANCE_BATCH(); + } +-- +1.7.4.1 + --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch @@ -0,0 +1,155 @@ +commit 3e28a0c0b43823d3104fe8fc50b5994b41fc0cc1 +Author: Chris Wilson +Date: Thu Jan 20 15:07:26 2011 +0000 + + Create the UXA generational resources during screen create + + Signed-off-by: Chris Wilson + +diff --git a/src/intel.h b/src/intel.h +index e7c47db..4c755fc 100644 +--- a/src/intel.h ++++ b/src/intel.h +@@ -661,7 +661,7 @@ static inline Bool pixmap_is_scanout(PixmapPtr pixmap) + const OptionInfoRec *intel_uxa_available_options(int chipid, int busid); + + Bool intel_uxa_init(ScreenPtr pScreen); +-void intel_uxa_create_screen_resources(ScreenPtr pScreen); ++Bool intel_uxa_create_screen_resources(ScreenPtr pScreen); + void intel_uxa_block_handler(intel_screen_private *intel); + Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, + int num_bos); +diff --git a/src/intel_driver.c b/src/intel_driver.c +index 2cd5f1f..ebed258 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -234,9 +234,7 @@ static Bool i830CreateScreenResources(ScreenPtr screen) + if (!(*screen->CreateScreenResources) (screen)) + return FALSE; + +- intel_uxa_create_screen_resources(screen); +- +- return TRUE; ++ return intel_uxa_create_screen_resources(screen); + } + + static void PreInitCleanup(ScrnInfoPtr scrn) +@@ -1046,7 +1044,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) + I830UeventInit(scrn); + #endif + +- return uxa_resources_init(screen); ++ return TRUE; + } + + static void i830AdjustFrame(int scrnIndex, int x, int y, int flags) +diff --git a/src/intel_uxa.c b/src/intel_uxa.c +index 8f58c29..9341b91 100644 +--- a/src/intel_uxa.c ++++ b/src/intel_uxa.c +@@ -1089,12 +1089,15 @@ static Bool intel_uxa_destroy_pixmap(PixmapPtr pixmap) + return TRUE; + } + +-void intel_uxa_create_screen_resources(ScreenPtr screen) ++Bool intel_uxa_create_screen_resources(ScreenPtr screen) + { + ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + intel_screen_private *intel = intel_get_screen_private(scrn); + dri_bo *bo = intel->front_buffer; + ++ if (!uxa_resources_init(screen)) ++ return FALSE; ++ + drm_intel_gem_bo_map_gtt(bo); + + if (intel->use_shadow) { +@@ -1111,6 +1114,8 @@ void intel_uxa_create_screen_resources(ScreenPtr screen) + NULL); + scrn->displayWidth = intel->front_pitch / intel->cpp; + } ++ ++ return TRUE; + } + + static void + +From c6dc27562abbc8ca9e873ad502ca49ae010461d2 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Mon, 24 Jan 2011 20:25:27 +0000 +Subject: uxa: Only recreate the glyph cache on *generational* updates + +The screen resources are recreated when the screen is rotated as well, +without being finalized. In this case, we do not need to reconstuct the +cache (or if we did, we would need to tear it down first). + +Reported-by: Till Matthiesen +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33412 +Signed-off-by: Chris Wilson +--- +diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c +index 420e891..0f5ddda 100644 +--- a/uxa/uxa-glyphs.c ++++ b/uxa/uxa-glyphs.c +@@ -111,6 +111,9 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) + uxa_screen_t *uxa_screen = uxa_get_screen(pScreen); + int i; + ++ if (!uxa_screen->glyph_cache_initialized) ++ return; ++ + for (i = 0; i < UXA_NUM_GLYPH_CACHE_FORMATS; i++) { + uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i]; + +@@ -120,6 +123,7 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) + if (cache->glyphs) + free(cache->glyphs); + } ++ uxa_screen->glyph_cache_initialized = FALSE; + } + + void uxa_glyphs_fini(ScreenPtr pScreen) +@@ -145,6 +149,10 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen) + }; + int i; + ++ if (uxa_screen->glyph_cache_initialized) ++ return TRUE; ++ ++ uxa_screen->glyph_cache_initialized = TRUE; + memset(uxa_screen->glyphCaches, 0, sizeof(uxa_screen->glyphCaches)); + + for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) { +@@ -214,17 +222,7 @@ Bool uxa_glyphs_init(ScreenPtr pScreen) + if (uxa_get_screen(pScreen)->force_fallback) + return TRUE; + +- /* We are trying to initialise per screen resources prior to the +- * complete initialisation of the screen. So ensure the components +- * that we depend upon are initialsed prior to our use. +- */ +- if (!CreateScratchPixmapsForScreen(pScreen->myNum)) +- return FALSE; +- +- if (!uxa_realize_glyph_caches(pScreen)) +- return FALSE; +- +- return TRUE; ++ return uxa_realize_glyph_caches(pScreen); + } + + /* The most efficient thing to way to upload the glyph to the screen +diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h +index 92536cc..ac206af 100644 +--- a/uxa/uxa-priv.h ++++ b/uxa/uxa-priv.h +@@ -139,6 +139,7 @@ typedef struct { + unsigned offScreenCounter; + + uxa_glyph_cache_t glyphCaches[UXA_NUM_GLYPH_CACHE_FORMATS]; ++ Bool glyph_cache_initialized; + + PicturePtr solid_clear, solid_black, solid_white; + uxa_solid_cache_t solid_cache[UXA_NUM_SOLID_CACHE]; +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/113_remove_broken_max_base_addresses.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/113_remove_broken_max_base_addresses.patch @@ -0,0 +1,46 @@ +From 23f9b14df7c102c1036134835dd5d1a508059858 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Sat, 12 Feb 2011 10:42:34 +0000 +Subject: i965: Remove broken maximum base addresses from video + +WRONG. + +The hardware was never limited to 0x1000000 and the kernel can quite +rightly place objects above that limit. Specifying such had no relation +to reality, so why did we do it? TWICE! + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34017 +Signed-off-by: Chris Wilson +--- +diff --git a/src/i965_video.c b/src/i965_video.c +index a7374a2..e16a575 100644 +--- a/src/i965_video.c ++++ b/src/i965_video.c +@@ -821,20 +821,20 @@ i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * surface_state_binding_tab + OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* media base addr, don't care */ + OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Instruction base address */ + /* general state max addr, disabled */ +- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); ++ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); + /* media object state max addr, disabled */ +- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); ++ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); + /* Instruction max addr, disabled */ +- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); ++ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); + } else { + OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4); + OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Generate state base address */ + OUT_RELOC(surface_state_binding_table_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, BASE_ADDRESS_MODIFY); /* Surface state base address */ + OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* media base addr, don't care */ + /* general state max addr, disabled */ +- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); ++ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); + /* media object state max addr, disabled */ +- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); ++ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); + } + + /* Set system instruction pointer */ +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.14.0.orig/debian/patches/110_warnings_cleanup.patch +++ xserver-xorg-video-intel-2.14.0/debian/patches/110_warnings_cleanup.patch @@ -0,0 +1,61 @@ +diff --git a/src/i915_render.c b/src/i915_render.c +index 6d844e5..9739a72 100644 +--- a/src/i915_render.c ++++ b/src/i915_render.c +@@ -546,7 +546,7 @@ i915_emit_composite_primitive(PixmapPtr dest, + { + ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; + intel_screen_private *intel = intel_get_screen_private(scrn); +- Bool is_affine_src, is_affine_mask = TRUE; ++ Bool is_affine_src = TRUE, is_affine_mask = TRUE; + int per_vertex, num_floats; + int tex_unit = 0; + int src_unit = -1, mask_unit = -1; +diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h +index 6fa1c05..888abeb 100644 +--- a/src/xvmc/intel_batchbuffer.h ++++ b/src/xvmc/intel_batchbuffer.h +@@ -24,7 +24,7 @@ extern int VERBOSE; + + #define OUT_RELOC(bo,read_domains,write_domains,delta) \ + do { \ +- *(unsigned int *)batch_ptr = delta + bo->offset; \ ++ *(unsigned int *)batch_ptr = (delta) + bo->offset; \ + intel_batch_emit_reloc(bo, read_domains, write_domains, delta, batch_ptr); \ + batch_ptr += 4; \ + } while (0) +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index 6cbec80..6bfd9d1 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -1071,7 +1071,7 @@ _X_EXPORT Status XvMCLoadQMatrix(Display * display, XvMCContext * context, + _X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context, + char *slice, int nbytes) + { +- if (xvmc_driver->put_slice(display, context, slice, nbytes)) { ++ if (xvmc_driver->put_slice(display, context, (unsigned char *) slice, nbytes)) { + XVMC_ERR("PutSlice fail\n"); + return BadValue; + } +@@ -1082,7 +1082,7 @@ _X_EXPORT Status XvMCPutSlice2(Display * display, XvMCContext * context, + char *slice, int nbytes, int slice_code) + { + if (xvmc_driver->put_slice2 +- (display, context, slice, nbytes, slice_code)) { ++ (display, context, (unsigned char *) slice, nbytes, slice_code)) { + XVMC_ERR("PutSlice2 fail\n"); + return BadValue; + } +diff --git a/src/xvmc/intel_xvmc_dump.c b/src/xvmc/intel_xvmc_dump.c +index 974bcbb..d22d311 100644 +--- a/src/xvmc/intel_xvmc_dump.c ++++ b/src/xvmc/intel_xvmc_dump.c +@@ -38,7 +38,7 @@ void intel_xvmc_dump_open(void) + if (xvmc_dump) + return; + +- if (d = getenv("INTEL_XVMC_DUMP")) ++ if ((d = getenv("INTEL_XVMC_DUMP"))) + xvmc_dump = 1; + + if (xvmc_dump) { --- xserver-xorg-video-intel-2.14.0.orig/src/scripts/fix.5c +++ xserver-xorg-video-intel-2.14.0/src/scripts/fix.5c @@ -0,0 +1,14 @@ +/* + * Convert CSC fix point values to floats + */ + +real fixval (int fix) +{ + int exp = fix >> 9; + int mant = fix & ((1 << 9) - 1); + real ret; + if (exp == 0x7) + return 1.0; + ret = (2 ** -exp) * mant / (1 << 9); + return ret; +} --- xserver-xorg-video-intel-2.14.0.orig/src/scripts/clock-graph.5c +++ xserver-xorg-video-intel-2.14.0/src/scripts/clock-graph.5c @@ -0,0 +1,174 @@ +autoload Cairo; +import Cairo; +library "examples/sort.5c"; +import Sort; + +int width = 1000, height = 200; +int min_vco = 1400000000; +int max_vco = 2800000000; +int min = 0xffffffff; +int max = 0; + +int max_clocks = 2000; +int[4][max_clocks] clocks; +int[4][max_clocks] vcos; +int[4] clock_count = {0...}; + +int[4] p2vals = {5,10,7,14}; + +cairo_t cr = Cairo::new(width, height); + +void calc_p2(int p2i) +{ + int p2 = p2vals[p2i]; + int min_p, max_p; + + clocks[p2i] = (int [max_clocks]){0...}; + + if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; + } else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; + } + + for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 5; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < min_vco || vco > max_vco) + continue; + +/* + printf("clock: %d (%d,%d), %d, " + "(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); +*/ + + clocks[p2i][clock_count[p2i]] = clock; + vcos[p2i][clock_count[p2i]] = vco; + clock_count[p2i]++; + } + } + } + } +} + +bool sort_p2(poly a, poly b) +{ + return a > b; +} + +int min_rate = 25000 * 1000; +int max_rate = 200000 * 1000; + +real scale_x(real clock) +{ + int min_x = 75, max_x = width - 50; + + real frac = (clock - min_rate) / (max_rate - min_rate); + + return min_x + frac * (max_x - min_x); +} + +for (p2i = 0; p2i < dim(p2vals); p2i++) { + int p2 = p2vals[p2i]; + calc_p2(p2i); + real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height; + real row_y2 = p2i / (dim(p2vals) + 1) * height; + + /*qsort(&p2vals[p2i], sort_p2);*/ + + switch (p2) { + case 5: + set_source_rgb(cr, 1,0,0); + break; + case 10: + set_source_rgb(cr, 0,1,0); + break; + case 7: + set_source_rgb(cr, 0,0,1); + break; + case 14: + set_source_rgb(cr, 0,0,0); + break; + } + + /* draw the line for the clock */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + real xpos; + + if (clock < min_rate || clock > max_rate) + continue; + + xpos = scale_x(clock); + move_to(cr, xpos, row_y1); + line_to(cr, xpos, row_y2); + stroke(cr); + } + + set_source_rgb(cr, 1, 1, 1); + /* add a mark for the vco value of the clocks at each location */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + int vco = vcos[p2i][i]; + real mark_center; + + if (clock < min_rate || clock > max_rate) + continue; + + real xpos = scale_x(clock); + real vcofrac = (vco - min_vco) / (max_vco - min_vco); + real mark_height = (row_y1 + vcofrac * (row_y2 - row_y1)); + + move_to(cr, xpos, mark_height - 1); + line_to(cr, xpos, mark_height + 1); + stroke(cr); + } + + set_source_rgb(cr, 0, 0, 0); + string p2label = sprintf("p2 = %d", p2); + move_to(cr, 5, (p2i + .5) / (dim(p2vals) + 1) * height + 4); + show_text(cr, p2label); +} + +void label_clock(real clock) { + real center_x = scale_x(clock); + string label = sprintf("%d", floor((clock + 500) / 1000000)); + text_extents_t e = text_extents(cr, label); + real left_x = center_x - e.x_advance / 2; + save(cr); + move_to(cr, left_x, height - 20); + show_text(cr, label); + restore(cr); +} + +label_clock(min_rate); +label_clock(max_rate); +label_clock(140 * 1000 * 1000); +label_clock(115 * 1000 * 1000); +label_clock(100 * 1000 * 1000); +label_clock(82 * 1000 * 1000); + +string xlabel = "Clock in Mhz"; +text_extents_t e = text_extents(cr, xlabel); +move_to(cr, width / 2 - e.x_advance / 2, height - 5); +show_text(cr, xlabel); +sleep(10); --- xserver-xorg-video-intel-2.14.0.orig/src/scripts/clock.5c +++ xserver-xorg-video-intel-2.14.0/src/scripts/clock.5c @@ -0,0 +1,40 @@ +int p2 = 14; +int min_p, max_p; + +if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; +} else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; +} + +for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 6; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < 1400000000 || + vco > 2800000000) + continue; + + printf("clock: %d (%d,%d),%d,(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); + } + } + } +} --- xserver-xorg-video-intel-2.14.0.orig/src/scripts/tv.5c +++ xserver-xorg-video-intel-2.14.0/src/scripts/tv.5c @@ -0,0 +1,128 @@ +/* + * tv.5c + * + * Compute tv encoder subcarrier dda constants + * + * The TV encoder subcarrier must be set precisely to the + * required frequency or the cumulative phase errors will be + * quite visible in the output. To accomplish this, the TV encoder + * has a complex circuit that takes a fixed clock, generated by the PLL + * and generates a precise subcarrier clock from that using the following + * formula: + * + * subcarrier = pixel_clock * (S1 + (S2 + (S3/Z3)) / Z2) / 4096 + * + * Careful selection of the constants will provide the necessarily + * precise clock. + * + * In the code below, S1 is represented by dda1, S2/Z2 by dda2 and S3/Z3 + * by dda3. + */ + +typedef struct { + int step; + int size; +} term_t; + +/* + * Find the approximation closest, but no larger than 'v', where + * 0 <= v < 1, and the result denominator must be less than 30000. + */ +term_t approx (rational v) +{ + rational best_dist = 1.0; + term_t best; + + for (int den = 20000; den < 30000; den++) + { + int num = floor (v * den); + term_t approx = { step = num, size = den }; + rational dist = v - approx.step/approx.size; + if (dist >= 0 && dist < best_dist) + { + best_dist = dist; + best = approx; + } + } + return best; +} + +typedef struct { + rational subcarrier; + rational pixel; + rational result; + term_t dda1; + term_t dda2; + term_t dda3; +} dda; + +/* + * Compute the dda constants for the given pixel clock and + * desired subcarrier frequency + */ + +dda find_dda (rational pixel, rational subcarrier) +{ + dda d; + + d.subcarrier = subcarrier; + d.pixel = pixel; + + rational dda1 = subcarrier / pixel * 4096; + d.dda1 = (term_t) { step = floor (dda1), size = 4096 }; + + rational dda2 = dda1 - d.dda1.step; + d.dda2 = approx (dda2); + + rational dda3 = dda2 * d.dda2.size - d.dda2.step; + d.dda3 = approx (dda3); + + /* Compute the resulting pixel clock to compare */ + d.result = d.pixel * (d.dda1.step + + (d.dda2.step + d.dda3.step/d.dda3.size) / + d.dda2.size) / d.dda1.size; + return d; +} + +/* + * Print out the computed constants + */ +void print_dda (dda d) +{ + printf ("\t/* desired %9.7f actual %9.7f clock %g */\n", + d.subcarrier, d.result, d.pixel); + printf ("\t.dda1_inc\t= %6d,\n", d.dda1.step); + printf ("\t.dda2_inc\t= %6d,\t.dda2_size\t= %6d,\n", + d.dda2.step, d.dda2.step != 0 ? d.dda2.size : 0); + printf ("\t.dda3_inc\t= %6d,\t.dda3_size\t= %6d,\n", + d.dda3.step, d.dda3.step != 0 ? d.dda3.size : 0); +} + +/* + * These are all of the required subcarrier frequencies + */ +rational[] subcarriers = { + /* these are the values we use; for some reason, this generates + * a more stable image (at least for NTSC) */ + 3.580, 4.434, 3.582, 3.576, 4.430, + + /* these are the values pulled out of the various specs */ + 3.579545, 4.433618, 3.582056, 3.575611, 4.433618 +}; + +/* + * We fix the pixel clock to a value which the hardware can + * generate exactly + */ +rational pixel = 107.520; + +void main () +{ + for (int i = 0; i < dim(subcarriers); i++) + { + dda d = find_dda (pixel, subcarriers[i]); + print_dda (d); + } +} + +main (); --- xserver-xorg-video-intel-2.14.0.orig/uxa/uxa-render.c +++ xserver-xorg-video-intel-2.14.0/uxa/uxa-render.c @@ -460,12 +460,12 @@ } static PicturePtr -uxa_picture_for_pixman_format(ScreenPtr pScreen, +uxa_picture_for_pixman_format(ScreenPtr screen, pixman_format_code_t format, int width, int height) { - PicturePtr pPicture; - PixmapPtr pPixmap; + PicturePtr picture; + PixmapPtr pixmap; int error; if (format == PIXMAN_a1) @@ -475,24 +475,29 @@ if (PIXMAN_FORMAT_A(format) == 0) format = PIXMAN_a8r8g8b8; - pPixmap = (*pScreen->CreatePixmap)(pScreen, width, height, - PIXMAN_FORMAT_DEPTH(format), - UXA_CREATE_PIXMAP_FOR_MAP); - if (!pPixmap) + pixmap = screen->CreatePixmap(screen, width, height, + PIXMAN_FORMAT_DEPTH(format), + UXA_CREATE_PIXMAP_FOR_MAP); + if (!pixmap) return 0; - pPicture = CreatePicture(0, &pPixmap->drawable, - PictureMatchFormat(pScreen, - PIXMAN_FORMAT_DEPTH(format), - format), - 0, 0, serverClient, &error); - (*pScreen->DestroyPixmap) (pPixmap); - if (!pPicture) + if (!uxa_pixmap_is_offscreen(pixmap)) { + screen->DestroyPixmap(pixmap); + return 0; + } + + picture = CreatePicture(0, &pixmap->drawable, + PictureMatchFormat(screen, + PIXMAN_FORMAT_DEPTH(format), + format), + 0, 0, serverClient, &error); + screen->DestroyPixmap(pixmap); + if (!picture) return 0; - ValidatePicture(pPicture); + ValidatePicture(picture); - return pPicture; + return picture; } static PicturePtr @@ -1090,6 +1095,7 @@ /* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must * manually append the damaged regions ourselves. */ + pixman_region_translate(®ion, -dst_x, -dst_y); DamageRegionAppend(dst->pDrawable, ®ion); pixman_region_fini(®ion);