256.38.02256.38.02

6 files changed, 46 insertions, 20 deletions

diff --git a/src/XF86Config-parser/Device.c b/src/XF86Config-parser/Device.c
index a374fa4..10a9c17 100644
--- a/src/XF86Config-parser/Device.c
+++ b/src/XF86Config-parser/Device.c
@@ -434,8 +434,8 @@ int xconfigParsePciBusString(const char *busID,
 {
     /*
      * The format is assumed to be "bus[@domain]:device[:func]", where domain,
-     * bus, device and func are decimal integers.  domain and func may be
-     * omitted and assumed to be zero, although doing this isn't encouraged.
+     * bus, device and func are decimal integers. func may be omitted and
+     * assumed to be zero.
      */
     
     char *p, *s, *d;
@@ -499,3 +499,18 @@ int xconfigParsePciBusString(const char *busID,
     return TRUE;
 }
 
+
+/*
+ * xconfigFormatPciBusString : The function checks for the availability
+ * of PCI domain & accordingly formats the busid string.
+ */
+void xconfigFormatPciBusString(char *str, int len,
+                               int domain, int bus, int device)
+{
+    if (domain) {
+        snprintf(str, len, "PCI:%d@%d:%d:0", bus, domain, device);
+    } else {
+        snprintf(str, len, "PCI:%d:%d:0", bus, device);
+    }
+    str[len - 1] = '\0';
+}
diff --git a/src/XF86Config-parser/Generate.c b/src/XF86Config-parser/Generate.c
index 89f4361..5137d6f 100644
--- a/src/XF86Config-parser/Generate.c
+++ b/src/XF86Config-parser/Generate.c
@@ -51,8 +51,8 @@ static int is_file(const char *filename);
 static void add_font_path(GenerateOptions *gop, XConfigPtr config);
 static void add_modules(GenerateOptions *gop, XConfigPtr config);
 
-static XConfigDevicePtr
-add_device(XConfigPtr config, int bus, int slot, char *boardname, int count);
+static XConfigDevicePtr add_device(XConfigPtr config, int bus, int domain,
+                                   int slot, char *boardname, int count);
 
 static void add_layout(GenerateOptions *gop, XConfigPtr config);
 
@@ -99,7 +99,7 @@ XConfigPtr xconfigGenerate(GenerateOptions *gop)
  */
 
 XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config,
-                                          int bus, int slot,
+                                          int bus, int domain, int slot,
                                           char *boardname, int count)
 {
     XConfigScreenPtr screen, s;
@@ -107,7 +107,7 @@ XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config,
     XConfigMonitorPtr monitor;
 
     monitor = xconfigAddMonitor(config, count);
-    device = add_device(config, bus, slot, boardname, count);
+    device = add_device(config, bus, domain, slot, boardname, count);
 
     screen = xconfigAlloc(sizeof(XConfigScreenRec));
 
@@ -463,8 +463,8 @@ XConfigMonitorPtr xconfigAddMonitor(XConfigPtr config, int count)
  * add_device()
  */
 
-static XConfigDevicePtr
-add_device(XConfigPtr config, int bus, int slot, char *boardname, int count)
+static XConfigDevicePtr add_device(XConfigPtr config, int bus, int domain,
+                                   int slot, char *boardname, int count)
 {
     XConfigDevicePtr device, d;
 
@@ -475,9 +475,9 @@ add_device(XConfigPtr config, int bus, int slot, char *boardname, int count)
     device->driver = xconfigStrdup("nvidia");
     device->vendor = xconfigStrdup("NVIDIA Corporation");
 
-    if (bus != -1 && slot != -1) {
+    if (bus != -1 && domain != -1 && slot != -1) {
         device->busid = xconfigAlloc(32);
-        snprintf(device->busid, 32, "PCI:%d:%d:0", bus, slot);
+        xconfigFormatPciBusString(device->busid, 32, domain, bus, slot);
     }
 
     if (boardname) device->board = xconfigStrdup(boardname);
@@ -532,7 +532,7 @@ static void add_layout(GenerateOptions *gop, XConfigPtr config)
 
     /* assume 1 X screen */
 
-    screen = xconfigGenerateAddScreen(config, -1, -1, NULL, 0);
+    screen = xconfigGenerateAddScreen(config, -1, -1, -1, NULL, 0);
 
     /* create layout */
 
diff --git a/src/XF86Config-parser/xf86Parser.h b/src/XF86Config-parser/xf86Parser.h
index f207e31..bbbbf9b 100644
--- a/src/XF86Config-parser/xf86Parser.h
+++ b/src/XF86Config-parser/xf86Parser.h
@@ -710,6 +710,8 @@ XConfigOptionPtr xconfigParseOption(XConfigOptionPtr head);
 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);
 
 void xconfigAddDisplay(XConfigDisplayPtr *pHead, const int depth);
 
@@ -718,7 +720,8 @@ void xconfigRemoveMode(XConfigModePtr *pHead, const char *name);
 
 XConfigPtr xconfigGenerate(GenerateOptions *gop);
 
-XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config, int bus, int slot,
+XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config,
+                                          int bus, int domain, int slot,
                                           char *boardname, int count);
 
 void xconfigGenerateAssignScreenAdjacencies(XConfigLayoutPtr layout);
diff --git a/src/gtk+-2.x/ctkdisplaydevice-dfp.c b/src/gtk+-2.x/ctkdisplaydevice-dfp.c
index 1183d56..887fbd1 100644
--- a/src/gtk+-2.x/ctkdisplaydevice-dfp.c
+++ b/src/gtk+-2.x/ctkdisplaydevice-dfp.c
@@ -405,7 +405,7 @@ GtkWidget* ctk_display_device_dfp_new(NvCtrlAttributeHandle *handle,
     eventbox = gtk_event_box_new();
     gtk_container_add(GTK_CONTAINER(eventbox), frame);
     gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 0);
-    ctk_display_device_dfp->scaling_frame = frame;
+    ctk_display_device_dfp->scaling_frame = eventbox;
     
     ctk_config_set_tooltip(ctk_config, eventbox, __scaling_help);
 
diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c
index 2ef0425..714b3bd 100644
--- a/src/gtk+-2.x/ctkpowermizer.c
+++ b/src/gtk+-2.x/ctkpowermizer.c
@@ -62,9 +62,11 @@ static const char *__performance_mode_short_help =
 "This indicates the current Performance Mode of the GPU.";
 
 static const char *__performance_mode_help =
-"This indicates the current Performance Mode of the GPU.  "
-"Performance Mode can be either \"Desktop\" or "
-"\"Maximum Performance\".";
+"This reports the current Performance Mode of the GPU.  This indicates "
+"the driver's current power strategy.  Possible Performance "
+"Mode values are \"Desktop\" (the GPU is being used for desktop-oriented "
+"purposes) and \"Maximum Performance\" (typically, an OpenGL, VDPAU, or "
+"CUDA application is running).";
 
 static const char *__gpu_clock_freq_help =
 "This indicates the current GPU Clock frequency.";
diff --git a/src/gtk+-2.x/ctkslimm.c b/src/gtk+-2.x/ctkslimm.c
index 9e4047a..7566614 100644
--- a/src/gtk+-2.x/ctkslimm.c
+++ b/src/gtk+-2.x/ctkslimm.c
@@ -1049,8 +1049,11 @@ static Bool parse_slimm_layout(CtkSLIMM *ctk_slimm,
                 }
             }
         }
-        if (*voverlap > 0) { *voverlap = (*cur_modeline)->data.vdisplay - *voverlap; }
-        if (*voverlap < 0) { *voverlap += (*cur_modeline)->data.vdisplay; }
+        if (*voverlap > 0) {
+            *voverlap = (*cur_modeline)->data.vdisplay - *voverlap;
+        } else if (*voverlap < 0) {
+            *voverlap += (*cur_modeline)->data.vdisplay;
+        }
 
 
         /* Calculte column overlap */
@@ -1069,8 +1072,11 @@ static Bool parse_slimm_layout(CtkSLIMM *ctk_slimm,
                 }
             }
         }
-        if (*hoverlap > 0) { *hoverlap = (*cur_modeline)->data.hdisplay - *hoverlap; }
-        if (*hoverlap < 0) { *hoverlap += (*cur_modeline)->data.hdisplay; }
+        if (*hoverlap > 0) {
+            *hoverlap = (*cur_modeline)->data.hdisplay - *hoverlap;
+        } else if (*hoverlap < 0) {
+            *hoverlap += (*cur_modeline)->data.hdisplay;
+        }
     }
     
     XFree(metamode_str);