xserver: Branch 'server-1.14-branch'

[Matt Dew]

 hw/xfree86/common/xf86Bus.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bab4908579f6b034ea38f8df2f8dc1f9f026f5e1
Author: Connor Behan <connor.behan at gmail.com>
Date:   Thu Oct 17 18:26:28 2013 -0700

    xfree86: Find primary entity when bus types are nominally different
    
    As of server 1.13, systems with DRM and Udev will have BUS_PLATFORM as
    their primary bus type. However, drivers not implementing a
    platformProbe function will still create entities of type BUS_PCI. We
    need to account for this when checking for the primary entity.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>
    Acked-by: Tormod Volden <debian.tormod at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index e101537..329d0b3 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -266,7 +266,9 @@ xf86IsEntityPrimary(int entityIndex)
 {
     EntityPtr pEnt = xf86Entities[entityIndex];
 
-    if (primaryBus.type != pEnt->bus.type)
+    if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI)
+	return MATCH_PCI_DEVICES(pEnt->bus.id.pci, primaryBus.id.plat->pdev);
+    else if (primaryBus.type != pEnt->bus.type)
         return FALSE;
 
     switch (pEnt->bus.type) {