[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#555906: marked as done (xserver-xorg-video-intel: enable KMS by default)

Your message dated Wed, 02 Dec 2009 17:35:31 +0000
with message-id <E1NFt6x-0002Sc-03@ries.debian.org>
and subject line Bug#555906: fixed in xserver-xorg-video-intel 2:2.9.1-1+exp1
has caused the Debian Bug report #555906,
regarding xserver-xorg-video-intel: enable KMS by default
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
555906: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555906
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: xserver-xorg-video-intel
Version: 2:2.9.0-1
Severity: normal
Tags: patch

Hi,

we should turn kms on by default in squeeze in the intel driver.  The
following patch is an attempt to do that, and deal gracefully with
downgrades.  It doesn't deal with plain 'remove; install old version'
though, I don't know how to make that work.  It'd be nice to have
someone check that I didn't screw it up.

From: Julien Cristau <jcristau@debian.org>
Date: Thu, 12 Nov 2009 15:29:00 +0100
Subject: [PATCH] Enable kernel mode setting by default on linux.

---
 debian/changelog                            |    1 +
 debian/i915-kms.conf                        |    1 +
 debian/rules                                |    4 ++++
 debian/xserver-xorg-video-intel.postinst.in |   21 +++++++++++++++++++++
 debian/xserver-xorg-video-intel.postrm.in   |   21 +++++++++++++++++++++
 debian/xserver-xorg-video-intel.prerm.in    |   21 +++++++++++++++++++++
 6 files changed, 69 insertions(+), 0 deletions(-)
 create mode 100644 debian/i915-kms.conf
 create mode 100644 debian/xserver-xorg-video-intel.postinst.in
 create mode 100644 debian/xserver-xorg-video-intel.postrm.in
 create mode 100644 debian/xserver-xorg-video-intel.prerm.in

diff --git a/debian/changelog b/debian/changelog
index 214bb48..f32ce38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.9.1-1) UNRELEASED; urgency=low
   * New upstream bugfix release.
     + reverts change from 2.9.0 that broke DVI detection for some people
       (closes: #548045)
+  * Enable kernel mode setting by default on linux.
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 12 Nov 2009 15:22:58 +0100
 
diff --git a/debian/i915-kms.conf b/debian/i915-kms.conf
new file mode 100644
index 0000000..597ac60
--- /dev/null
+++ b/debian/i915-kms.conf
@@ -0,0 +1 @@
+options i915 modeset=1
diff --git a/debian/rules b/debian/rules
index e58d55a..414e4bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,10 @@ binary-arch: build install serverabi
 	dh_installdocs README NEWS
 	dh_installchangelogs ChangeLog
 	dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+	install -d -m 755 debian/xserver-xorg-video-intel/etc/modprobe.d/
+	install -m 644 debian/i915-kms.conf debian/xserver-xorg-video-intel/etc/modprobe.d/
+endif
 	dh_installman
 	dh_link
 	dh_strip --dbg-package=xserver-xorg-video-intel-dbg
diff --git a/debian/xserver-xorg-video-intel.postinst.in b/debian/xserver-xorg-video-intel.postinst.in
new file mode 100644
index 0000000..d3a09ec
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.postinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=postinst
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+  abort-upgrade)
+  if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then
+    # failed downgrading to a version without kms
+    remove_conffile_rollback /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-video-intel.postrm.in b/debian/xserver-xorg-video-intel.postrm.in
new file mode 100644
index 0000000..3967436
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.postrm.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=postrm
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+  upgrade)
+  if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then
+    # downgrading to a version without kms
+    remove_conffile_commit /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-video-intel.prerm.in b/debian/xserver-xorg-video-intel.prerm.in
new file mode 100644
index 0000000..58082ed
--- /dev/null
+++ b/debian/xserver-xorg-video-intel.prerm.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_SCRIPT=prerm
+THIS_PACKAGE=xserver-xorg-video-intel
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+  upgrade)
+  if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then
+    # downgrading to a version without kms
+    remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
-- 
1.6.5

Cheers,
Julien

--- End Message ---
--- Begin Message --- 
Source: xserver-xorg-video-intel
Source-Version: 2:2.9.1-1+exp1

We believe that the bug you reported is fixed in the latest version of
xserver-xorg-video-intel, which is due to be installed in the Debian FTP archive:

xserver-xorg-video-intel-dbg_2.9.1-1+exp1_i386.deb
  to main/x/xserver-xorg-video-intel/xserver-xorg-video-intel-dbg_2.9.1-1+exp1_i386.deb
xserver-xorg-video-intel_2.9.1-1+exp1.diff.gz
  to main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.9.1-1+exp1.diff.gz
xserver-xorg-video-intel_2.9.1-1+exp1.dsc
  to main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.9.1-1+exp1.dsc
xserver-xorg-video-intel_2.9.1-1+exp1_i386.deb
  to main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.9.1-1+exp1_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 555906@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Brice Goglin <bgoglin@debian.org> (supplier of updated xserver-xorg-video-intel package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 02 Dec 2009 15:50:17 +0100
Source: xserver-xorg-video-intel
Binary: xserver-xorg-video-intel xserver-xorg-video-intel-dbg
Architecture: source i386
Version: 2:2.9.1-1+exp1
Distribution: experimental
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Brice Goglin <bgoglin@debian.org>
Description: 
 xserver-xorg-video-intel - X.Org X server -- Intel i8xx, i9xx display driver
 xserver-xorg-video-intel-dbg - X.Org X server -- Intel i8xx, i9xx display driver (debug symbols)
Closes: 555906
Changes: 
 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.
Checksums-Sha1: 
 9d212c0a447fc8de8ef6da4e3fbd3fffae8475c3 1989 xserver-xorg-video-intel_2.9.1-1+exp1.dsc
 a35e72f5317c2ebc2fdecf9d0a75a6d7f6226774 301107 xserver-xorg-video-intel_2.9.1-1+exp1.diff.gz
 8d49742e2ed5ebb2907fa29335d1318761ec7c6b 587544 xserver-xorg-video-intel_2.9.1-1+exp1_i386.deb
 7d9f3c43e418bb7961aaaaaed8822fbc2300ded0 1527290 xserver-xorg-video-intel-dbg_2.9.1-1+exp1_i386.deb
Checksums-Sha256: 
 149103e73974a5a1a26f34a87dd80a6367b96a62624177add903792e73bb4a1d 1989 xserver-xorg-video-intel_2.9.1-1+exp1.dsc
 9ab6cb38bfe40f4685a88fd22d62a7b4d3fc797cd504535f00687c61012798ea 301107 xserver-xorg-video-intel_2.9.1-1+exp1.diff.gz
 73f62d60b54cf82a8ded746e409a3ff7c4281a061a6d9ed65abb48823909b96f 587544 xserver-xorg-video-intel_2.9.1-1+exp1_i386.deb
 4de83486706bb59dfa20a312e4ff654a199bd623f0119b8d85ada97bb7c406fb 1527290 xserver-xorg-video-intel-dbg_2.9.1-1+exp1_i386.deb
Files: 
 c262f939b93ad8141c1ecf48597a6a78 1989 x11 optional xserver-xorg-video-intel_2.9.1-1+exp1.dsc
 186083df116a026d5fb4c8f889833a97 301107 x11 optional xserver-xorg-video-intel_2.9.1-1+exp1.diff.gz
 bc5096db228f6c908ba138f6f14e0516 587544 x11 optional xserver-xorg-video-intel_2.9.1-1+exp1_i386.deb
 ca393fcae028ce3ee362a76f44543948 1527290 debug extra xserver-xorg-video-intel-dbg_2.9.1-1+exp1_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAksWhKgACgkQRh88F8PcWfpVVACguu3Wwt6r0RMI1PwP1NMxiDpm
2GMAnjj0zUNPqvKuSMz7atJJbnvt8THn
=Otmq
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: