debian/changelog | 7 +
debian/patches/fail-probe-if-no-kms.diff | 40
++++++++++
debian/patches/revert-display-outputs-are-enabled-automatically.diff | 13 +--
debian/patches/series | 1
4 files changed, 53 insertions(+), 8 deletions(-)
New commits:
commit 50b0eccdd708aec16a9d95f0961fffa923f7dbe3
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Dec 6 10:26:39 2010 +0100
Refresh patch
diff --git
a/debian/patches/revert-display-outputs-are-enabled-automatically.diff
b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
index 497ca29..081f83e 100644
--- a/debian/patches/revert-display-outputs-are-enabled-automatically.diff
+++ b/debian/patches/revert-display-outputs-are-enabled-automatically.diff
@@ -11,10 +11,10 @@ switch. Debian bug#600405.
src/intel_display.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
-diff --git a/src/intel_display.c b/src/intel_display.c
-index d32224e..d9c4b5b 100644
---- a/src/intel_display.c
-+++ b/src/intel_display.c
+Index: xserver-xorg-video-intel/src/intel_display.c
+===================================================================
+--- xserver-xorg-video-intel.orig/src/intel_display.c
++++ xserver-xorg-video-intel/src/intel_display.c
@@ -327,7 +327,7 @@ intel_crtc_apply(xf86CrtcPtr crtc)
uint32_t *output_ids;
int output_count = 0;
@@ -24,7 +24,7 @@ index d32224e..d9c4b5b 100644
output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
if (!output_ids)
-@@ -378,14 +378,26 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+@@ -380,14 +380,26 @@ intel_crtc_apply(xf86CrtcPtr crtc)
} else
ret = TRUE;
@@ -52,6 +52,3 @@ index d32224e..d9c4b5b 100644
}
static Bool
---
-1.7.2.3
-
commit ac1906c9d9cf0c16b0471bcb20c1aae88340e00d
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Dec 6 10:25:57 2010 +0100
Fail intel_pci_probe if we don't have a kernel mode setting driver.
This allows the X server to fall back to the vesa driver instead.
diff --git a/debian/changelog b/debian/changelog
index a38ddfe..6ab6ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.13.0-4) UNRELEASED; urgency=low
+
+ * Fail intel_pci_probe if we don't have a kernel mode setting driver. This
+ allows the X server to fall back to the vesa driver instead.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 06 Dec 2010 10:22:35 +0100
+
xserver-xorg-video-intel (2:2.13.0-3) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/fail-probe-if-no-kms.diff
b/debian/patches/fail-probe-if-no-kms.diff
new file mode 100644
index 0000000..c88f9cb
--- /dev/null
+++ b/debian/patches/fail-probe-if-no-kms.diff
@@ -0,0 +1,40 @@
+From a2b44cc8d4a9182becaaa00eda1ad3adcea92ee3 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Thu, 23 Sep 2010 17:17:05 +0200
+Subject: [PATCH] intel_pci_probe: bail if there's no KMS
+
+This allows fallback to vesa when there's no kernel driver bound to the
+intel pci device.
+---
+ src/intel_module.c | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 53e1cb6..7356ab8 100644
+--- a/src/intel_module.c
++++ b/src/intel_module.c
+@@ -374,6 +374,21 @@ static Bool intel_pci_probe (DriverPtr driver,
+ intptr_t match_data)
+ {
+ ScrnInfoPtr scrn = NULL;
++ if (!pci_device_has_kernel_driver(device))
++#if KMS_ONLY
++ return FALSE;
++#else
++ switch (DEVICE_ID(device)) {
++ case PCI_CHIP_I810:
++ case PCI_CHIP_I810_DC100:
++ case PCI_CHIP_I810_E:
++ case PCI_CHIP_I815:
++ break;
++
++ default:
++ return FALSE;
++ }
++#endif
+
+ scrn = xf86ConfigPciEntity(scrn, 0, entity_num, intel_pci_chipsets,
+ NULL,
+--
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7732e96..ed16c3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
i8xx-shadow.diff
libdrm-from-sid-is-ok.diff
revert-display-outputs-are-enabled-automatically.diff
+fail-probe-if-no-kms.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ppxnd-0005ol...@alioth.debian.org
