Hello community, here is the log from the commit of package xf86-video-mga for openSUSE:Factory checked in at 2013-06-09 17:06:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mga (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mga" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mga/xf86-video-mga.changes 2013-03-21 11:05:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-mga.new/xf86-video-mga.changes 2013-06-09 17:06:40.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 7 08:12:03 UTC 2013 - [email protected] + +- U_Restrict-kernel-driver-matching-to-g200-server-chips.patch + * Restrict kernel driver matching to g200 server chips. Otherwise + we might catch devices handled by matroxfb, not the mgag200 kms + driver. (bnc#823410) + +------------------------------------------------------------------- New: ---- U_Restrict-kernel-driver-matching-to-g200-server-chips.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mga.spec ++++++ --- /var/tmp/diff_new_pack.2OLBpW/_old 2013-06-09 17:06:41.000000000 +0200 +++ /var/tmp/diff_new_pack.2OLBpW/_new 2013-06-09 17:06:41.000000000 +0200 @@ -25,6 +25,7 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch0: xf86-video-mga-g200se-swcursor.diff +Patch1: U_Restrict-kernel-driver-matching-to-g200-server-chips.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -63,6 +64,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build %configure ++++++ U_Restrict-kernel-driver-matching-to-g200-server-chips.patch ++++++ >From 49381ff2c3aa98be5bb84494b2ad3f81a0d31bcc Mon Sep 17 00:00:00 2001 From: Julien Cristau <[email protected]> Date: Mon, 7 Jan 2013 23:04:36 +0100 Subject: [PATCH] Restrict kernel driver matching to g200 server chips Otherwise we might catch devices handled by matroxfb, not the mgag200 kms driver. Debian bug#697532 Reported-by: [email protected] Reviewed-by: Dave Airlie <[email protected]> Signed-off-by: Julien Cristau <[email protected]> --- src/mga_driver.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/mga_driver.c b/src/mga_driver.c index 8c4bb9c..5cce7ac 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -676,12 +676,22 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * 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; + /* If it's a G200 server chip, it's probably on KMS, so bail; if not, + * it might be using matroxfb, which is ok. */ + switch (dev->device_id) { + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: + case PCI_CHIP_MGAG200_EV_PCI: + case PCI_CHIP_MGAG200_ER_PCI: + case PCI_CHIP_MGAG200_WINBOND_PCI: + case PCI_CHIP_MGAG200_EH_PCI: + 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 */ -- 1.8.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
