debian/changelog | 7 +++++++
src/cir_driver.c | 11 +++++++++++
2 files changed, 18 insertions(+)
New commits:
commit 6d558a146edbf3ef5b489a2729eb90491c1800b2
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jul 16 22:42:02 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e4030f1..d6bb0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.4.0-2) unstable; urgency=low
+
+ * cirrus: don't bind if there is a PCI kernel driver loaded, for
+ compatibility with the cirrus KMS driver in Linux 3.5.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 16 Jul 2012 22:41:46 +0200
+
xserver-xorg-video-cirrus (1:1.4.0-1) unstable; urgency=low
* New upstream release:
commit 2e35bc316d7b74feca177c87a49a8050a2a0ff00
Author: Dave Airlie <airl...@redhat.com>
Date: Thu May 17 10:23:34 2012 +0100
cirrus: don't bind if there is a PCI kernel driver loaded.
this should ensure we end up using -modesetting under kms.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 7e470bb..c6967da 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -256,6 +256,17 @@ CIRProbe(DriverPtr drv, int flags)
they should be handled in this driver (as opposed to their
own driver). */
pPci = xf86GetPciInfoForEntity(usedChips[i]);
+
+#ifdef XSERVER_LIBPCIACCESS
+ if (pci_device_has_kernel_driver(pPci)) {
+ xf86DrvMsg(0, X_ERROR,
+ "cirrus: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has
a kernel module claiming it.\n",
+ pPci->device_id, pPci->bus, pPci->domain, pPci->dev,
pPci->func);
+ xf86DrvMsg(0, X_ERROR,
+ "cirrus: This driver cannot operate until it has been
unloaded.\n");
+ return FALSE;
+ }
+#endif
pScrn = NULL;
if (pPci && (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5462 ||
PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 ||
--
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/e1sqsdk-00060j...@vasks.debian.org
