256.44256.44

6 files changed, 8 insertions, 8 deletions

diff --git a/XF86Config-parser/Device.c b/XF86Config-parser/Device.c
index 10a9c17..b730228 100644
--- a/XF86Config-parser/Device.c
+++ b/XF86Config-parser/Device.c
@@ -505,12 +505,12 @@ int xconfigParsePciBusString(const char *busID,
  * of PCI domain & accordingly formats the busid string.
  */
 void xconfigFormatPciBusString(char *str, int len,
-                               int domain, int bus, int device)
+                               int domain, int bus, int device, int func)
 {
     if (domain) {
-        snprintf(str, len, "PCI:%d@%d:%d:0", bus, domain, device);
+        snprintf(str, len, "PCI:%d@%d:%d:%d", bus, domain, device, func);
     } else {
-        snprintf(str, len, "PCI:%d:%d:0", bus, device);
+        snprintf(str, len, "PCI:%d:%d:%d", bus, device, func);
     }
     str[len - 1] = '\0';
 }
diff --git a/XF86Config-parser/Generate.c b/XF86Config-parser/Generate.c
index 5137d6f..efc79cf 100644
--- a/XF86Config-parser/Generate.c
+++ b/XF86Config-parser/Generate.c
@@ -477,7 +477,7 @@ static XConfigDevicePtr add_device(XConfigPtr config, int bus, int domain,
 
     if (bus != -1 && domain != -1 && slot != -1) {
         device->busid = xconfigAlloc(32);
-        xconfigFormatPciBusString(device->busid, 32, domain, bus, slot);
+        xconfigFormatPciBusString(device->busid, 32, domain, bus, slot, 0);
     }
 
     if (boardname) device->board = xconfigStrdup(boardname);
diff --git a/XF86Config-parser/xf86Parser.h b/XF86Config-parser/xf86Parser.h
index bbbbf9b..65855dc 100644
--- a/XF86Config-parser/xf86Parser.h
+++ b/XF86Config-parser/xf86Parser.h
@@ -711,7 +711,7 @@ void xconfigPrintOptionList(FILE *fp, XConfigOptionPtr list, int tabs);
 int xconfigParsePciBusString(const char *busID,
                              int *bus, int *device, int *func);
 void xconfigFormatPciBusString(char *str, int len,
-                               int domain, int bus, int device);
+                               int domain, int bus, int device, int func);
 
 void xconfigAddDisplay(XConfigDisplayPtr *pHead, const int depth);
 
diff --git a/multiple_screens.c b/multiple_screens.c
index b751bb8..0e4f7e3 100644
--- a/multiple_screens.c
+++ b/multiple_screens.c
@@ -445,7 +445,7 @@ static int enable_separate_x_screens(Options *op, XConfigPtr config,
             xconfigFormatPciBusString(screenlist[i]->device->busid, 32,
                                       pDevices->devices[i].dev.domain,
                                       pDevices->devices[i].dev.bus,
-                                      pDevices->devices[i].dev.slot);
+                                      pDevices->devices[i].dev.slot, 0);
 
             screenlist[i]->device->board = nvstrdup(pDevices->devices[i].name);
         }
diff --git a/query_gpu_info.c b/query_gpu_info.c
index 5ba1f44..fe6f254 100644
--- a/query_gpu_info.c
+++ b/query_gpu_info.c
@@ -71,7 +71,7 @@ int query_gpu_info(Options *op)
         xconfigFormatPciBusString(busid, BUS_ID_STRING_LENGTH,
                                   pDevices->devices[i].dev.domain,
                                   pDevices->devices[i].dev.bus,
-                                  pDevices->devices[i].dev.slot);
+                                  pDevices->devices[i].dev.slot, 0);
         fmtoutp(TAB, "PCI BusID : %s", busid);
 
         fmtout("");
diff --git a/version.mk b/version.mk
index 9378557..00dde01 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 256.38.02
+NVIDIA_VERSION = 256.44