xf86-video-modesetting: src/driver.c

Aaron Plattner aplattner at kemper.freedesktop.org
Thu Mar 21 11:12:16 PDT 2013


 src/driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e571934629280053caeb155e418acbdca609e36
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Feb 20 17:27:16 2013 -0800

    modesetting: match PCI class 3, any subclass
    
    If a device is not primary, the PCI device match fails because the
    xf86-video-modesetting driver looks specifically for a PCI class match of
    0x30000 with a mask of 0xffffff.  This fails to match, for example, a
    non-primary Intel VGA device, because it is reported as having a class of
    0x38000.
    
    Fix that by ignoring the low 16 bits of the class in the pci_id_match table.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed on IRC by Adam Jackson <ajax at redhat.com>

diff --git a/src/driver.c b/src/driver.c
index 05b6176..87ba272 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -86,7 +86,7 @@ static Bool ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op,
 static const struct pci_id_match ms_device_match[] = {
     {
 	PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-	0x00030000, 0x00ffffff, 0
+	0x00030000, 0x00ff0000, 0
     },
 
     { 0, 0, 0 },


More information about the xorg-commit mailing list