debian/changelog | 7 +++++++
src/mga_driver.c | 9 +++++++++
2 files changed, 16 insertions(+)
New commits:
commit a30db587d82d3a483ef6b88cfcaeb99f044ec605
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jul 16 22:57:32 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 75ff12d..c599f7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.5.0-2) unstable; urgency=low
+
+ * mga: don't bind to device if there is a kernel driver, to avoid conflicts
+ with the mga g200se KMS driver in Linux 3.5.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 16 Jul 2012 22:57:15 +0200
+
xserver-xorg-video-mga (1:1.5.0-1) unstable; urgency=low
* New upstream release, compatible with xserver 1.12.
commit 0af7dba78559ce82b4c3eed0862415efcde51863
Author: Dave Airlie <airl...@redhat.com>
Date: Thu May 17 10:19:21 2012 +0100
mga: don't bind to device if there is a kernel driver
this should only pick up KMS drivers and not old drm drivers.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/mga_driver.c b/src/mga_driver.c
index af005f1..61eb96c 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -682,6 +682,15 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct
pci_device * dev,
smga->pvp = dev;
#endif
+ if (pci_device_has_kernel_driver(dev)) {
+ xf86DrvMsg(0, X_ERROR,
+ "mga: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a
kernel module claiming it.\n",
+ dev->device_id, dev->bus, dev->domain, dev->dev, dev->func);
+ xf86DrvMsg(0, X_ERROR,
+ "mga: This driver cannot operate until it has been
unloaded.\n");
+ return FALSE;
+ }
+
/* Allocate a ScrnInfoRec and claim the slot */
pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, MGAPciChipsets,
NULL,
--
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/e1sqspb-0000ki...@vasks.debian.org
