xserver: Branch 'master' - 4 commits

[Adam Jackson]

 hw/xfree86/common/xf86pciBus.c |    6 +++---
 hw/xfree86/doc/ddxDesign.xml   |    3 ++-
 hw/xfree86/man/xorg.conf.man   |    8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit d2e57f71ad16f1e677dd542a8bc0db87dfa9791d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jun 19 19:05:32 2017 +0900

    xfree86: Document BusID PCI domain format in ddxDesign.xml
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 86d8d503d..757985026 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -145,7 +145,8 @@ following changes:
         purpose is to identify particular cards in a multi-headed
         configuration.  The format of the argument is intentionally
         vague, and may be architecture dependent.  For a PCI bus, it
-        is something like "bus:slot:func".
+        is something like "bus at domain:slot:func". The "@domain" part
+        can be left out for domain 0.
 	      </para></listitem></varlistentry>
 	</variablelist>
       </para>
commit 3b0fd9421add9f0ca8958ced0f39b2da21143c22
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jun 19 19:05:31 2017 +0900

    xfree86: Document BusID PCI domain format in xorg.conf manpage
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index ec8d07c65..1b134e867 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1376,10 +1376,10 @@ For PCI/AGP cards,
 the
 .I bus\-id
 string has the form
-.BI PCI: bus : device : function
-(e.g., \(lqPCI:1:0:0\(rq might be appropriate for an AGP card).
-This field is usually optional in single-head configurations when using
-the primary graphics card.
+.BI PCI: bus @ domain : device : function
+(e.g., \(lqPCI:1 at 0:0:0\(rq might be appropriate for an AGP card). The
+"@domain" part can be left out for PCI domain 0. This field is usually
+optional in single-head configurations when using the primary graphics card.
 In multi-head configurations, or when using a secondary graphics card in a
 single-head configuration, this entry is mandatory.
 Its main purpose is to make an unambiguous connection between the device
commit 8e00dc59b51da7e0d3978c26b1884c4767aa2dc2
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jun 19 19:05:30 2017 +0900

    xfree86: Fix printing of PCI domain/bus in xf86MatchPciInstances
    
    It was attempting to use the <bus>@<domain> format accepted by the BusID
    stanza, but the two values were swapped.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index ed82744b4..9d3447cdf 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -859,7 +859,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
             if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
                 xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
                             "for instance (BusID PCI:%u@%u:%u:%u) found\n",
-                            driverName, pPci->domain, pPci->bus, pPci->dev,
+                            driverName, pPci->bus, pPci->domain, pPci->dev,
                             pPci->func);
             }
         }
commit e905b19a53f96013c4417bec993a1dea5a3b0a5f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jun 19 19:05:29 2017 +0900

    xfree86: Print BusID stanza compatible bus IDs for found devices
    
    The PCI domain has to be specified like this:
    
     "PCI:<bus>@<domain>:<device>:<function>"
    
    Example before:
    
     (--) PCI:*(0:0:1:0) 1002:130f:1043:85cb [...]
     (--) PCI: (0:1:0:0) 1002:6939:1458:229d [...]
    
    after:
    
     (--) PCI:*(0 at 0:1:0) 1002:130f:1043:85cb [...]
     (--) PCI: (1 at 0:0:0) 1002:6939:1458:229d [...]
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 012ca08d2..ed82744b4 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -155,8 +155,8 @@ xf86PciProbe(void)
         if (xf86IsPrimaryPci(info))
             prim = "*";
 
-        xf86Msg(X_PROBED, "PCI:%s(%u:%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
-                info->domain, info->bus, info->dev, info->func,
+        xf86Msg(X_PROBED, "PCI:%s(%u@%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
+                info->bus, info->domain, info->dev, info->func,
                 info->vendor_id, info->device_id,
                 info->subvendor_id, info->subdevice_id);