--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: pre-approve unblock: nvidia-graphics-drivers/304.51-1, nvidia-settings/304.51-1
- From: Andreas Beckmann <debian@abeckmann.de>
- Date: Mon, 24 Sep 2012 23:10:10 +0200
- Message-id: <20120924211010.689.80466.reportbug@cake.ae.cs.uni-frankfurt.de>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please pre-approve packages nvidia-graphics-drivers/nvidia-support
This is a more general question how to handle Nvidia updates during the
freeze. Luckily we are now using 304.xx which is a "Long Lived Branch"
and is expected to receive bugfixes for quite some time.
This is also the branch that will become the next legacy branch getting
critical bug fixes as well as X and kernel support through the end of
2017. See http://nvidia.custhelp.com/app/answers/detail/a_id/3142
Therefore I'd like to follow new releases from this branch and get the
most current as possible into wheezy.
Today a new release came out, adds support for some new cards, fixes a
few bugs, e.g. #688660
There is also a packaging fix needed for #688659 where I need to readd a
dependency on libgl1-nvidia-alternatives-ia32 to prevent too early
removal of the diversions. Although I cannot reproduce it in automated
tests, I've seen a similar problem earlier (and thats the reason for
some more dependencies on empty transitional packages).
For nvidia-settings there is a small bugfix (in
ctkdisplayconfig-utils.c) and a lot of string changes, obviously Nvidia
has renamed some technology/product.
nvidia-xconfig has seen no changes besides a version bump, so I'll let
it get "out of sync" for now.
nvidia-graphics-modules will be requested later as that will take a trip
through NEW for the kernel ABI bump.
Should I upload this new upstream release to unstable or experimental?
I'd prefer unstable as I expect it will get more testing there.
Andreas
unblock nvidia-graphics-drivers/304.51-1
unblock nvidia-settings/304.51-1
diffstat for nvidia-graphics-drivers-304.48 nvidia-graphics-drivers-304.51
bug-control.in | 2 +-
changelog | 29 ++++++++++++++++++++++++++++-
control | 1 +
module/conftest.h | 2 +-
nv-readme.ids | 5 +++++
rules | 3 ++-
6 files changed, 38 insertions(+), 4 deletions(-)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/bug-control.in nvidia-graphics-drivers-304.51/debian/bug-control.in
--- nvidia-graphics-drivers-304.48/debian/bug-control.in 2012-08-16 11:04:28.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/bug-control.in 2012-09-24 22:17:28.000000000 +0200
@@ -1,3 +1,3 @@
report-with: nvidia-glx#LEGACY# libgl1-nvidia#LEGACY#-glx xserver-xorg-video-nvidia#LEGACY# nvidia-alternative#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source glx-alternative-nvidia
-package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau ia32-libs
+package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-legacy-96xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau ia32-libs
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/changelog nvidia-graphics-drivers-304.51/debian/changelog
--- nvidia-graphics-drivers-304.48/debian/changelog 2012-09-12 12:23:34.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/changelog 2012-09-24 22:17:28.000000000 +0200
@@ -1,3 +1,30 @@
+nvidia-graphics-drivers (304.51-1) UNRELEASED; urgency=low
+
+ * New upstream long lived branch release 304.51 (2012-09-24).
+ - Added support for the following GPUs: GeForce GT 645M,
+ GeForce GTX 670MX, GeForce GTX 675MX, GeForce GTX 650 Ti.
+ - Added support for the new Quadro Sync board for Quadro Kepler GPUs.
+ See the "Configuring Frame Lock and Genlock" chapter in the README
+ for details.
+ - Fixed an X server crash on X.Org xserver 1.13 when it is compiled
+ without support for DRI2.
+ - Fixed a regression that broke color controls on older X servers.
+ - Fixed a bug that prevented panning from working correctly after a
+ modeswitch on some X servers with support for cursor constraining.
+ - Gamma ramp and colormap adjustments now apply correctly when screen
+ transformations such as rotation and keystone correction are in use.
+ * Closes: #688660.
+ * Update nv-readme.ids.
+ * libgl1-nvidia-glx-ia32: readd Depends: libgl1-nvidia-alternatives-ia32 to
+ prevent apt from removing libgl1-nvidia-alternatives-ia32 (which would
+ remove the diversions) while the old (pre-transitional)
+ libgl1-nvidia-glx-ia32 is still installed. (Closes: #688659)
+ * get-orig-source: Fix caching for legacy drivers.
+ * bug-control: report version info about revived
+ libgl1-nvidia-legacy-96xx-glx-ia32.
+
+ -- Andreas Beckmann <debian@abeckmann.de> Mon, 24 Sep 2012 18:14:16 +0200
+
nvidia-graphics-drivers (304.48-1) unstable; urgency=low
* New upstream long lived branch release 304.48 (2012-09-11).
@@ -251,7 +278,7 @@
* nvidia-libopencl1: Provides/Conflicts/Replaces: libopencl1.
(Closes: #679047)
* xserver-xorg-video-nvidia.{config,postinst}: Present a debconf note about
- needing manual Xorg configuration to enable the fglrx driver.
+ needing manual Xorg configuration to enable the nvidia driver.
* xserver-xorg-video-nvidia.postrm: Present a debconf note if the driver was
removed, but it is still enabled in xorg.conf(.d/).
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/control nvidia-graphics-drivers-304.51/debian/control
--- nvidia-graphics-drivers-304.48/debian/control 2012-08-17 10:19:33.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/control 2012-09-24 20:53:59.000000000 +0200
@@ -176,6 +176,7 @@
libc6-i386 (>= 2.9-18),
nvidia-installer-cleanup,
Depends:
+ libgl1-nvidia-alternatives-ia32,
${shlibs:Depends}, ${misc:Depends}
Recommends:
libgl1-nvidia${nvidia:Legacy}-glx-i386,
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/module/conftest.h nvidia-graphics-drivers-304.51/debian/module/conftest.h
--- nvidia-graphics-drivers-304.48/debian/module/conftest.h 2012-09-12 12:17:11.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/module/conftest.h 2012-09-24 22:28:45.000000000 +0200
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 304.48, 295.75, 173.14.35, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 304.51, 295.75, 173.14.36, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/nv-readme.ids nvidia-graphics-drivers-304.51/debian/nv-readme.ids
--- nvidia-graphics-drivers-304.48/debian/nv-readme.ids 2012-09-12 11:41:07.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/nv-readme.ids 2012-09-24 19:54:28.000000000 +0200
@@ -395,6 +395,7 @@
10DE0DE0
10DE0DE1
10DE0DE2
+10DE0DE3
10DE0DE4
10DE0DE5
10DE0DE8
@@ -437,6 +438,7 @@
10DE0FD4
10DE0FD5
10DE0FD8
+10DE0FD9
10DE0FE0
10DE0FFB
10DE0FFC
@@ -484,11 +486,14 @@
10DE1189
10DE118F
10DE11A0
+10DE11A1
+10DE11A7
10DE11BA
10DE11BC
10DE11BD
10DE11BE
10DE11C0
+10DE11C6
10DE1200
10DE1201
10DE1203
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/rules nvidia-graphics-drivers-304.51/debian/rules
--- nvidia-graphics-drivers-304.48/debian/rules 2012-09-12 12:07:54.000000000 +0200
+++ nvidia-graphics-drivers-304.51/debian/rules 2012-09-24 22:14:47.000000000 +0200
@@ -352,7 +352,8 @@
get-orig-source:
rm -rf get-orig-source || true
mkdir get-orig-source
- ln -v ../.cache/*-$(version).run get-orig-source/ || true
+ ln -v ../.cache/*-$(version).run get-orig-source/ 2>/dev/null || true
+ ln -v ../.cache/*-$(version)-*.run get-orig-source/ 2>/dev/null || true
uscan --no-symlink --download-current-version $(PASV) \
--watchfile debian/watch --destdir get-orig-source
test $$(ls get-orig-source/* | wc -l) = 2 # we need exactly 2 downloaded files
diffstat for nvidia-settings-304.48 nvidia-settings-304.51
debian/changelog | 8 +++
doc/FRAMELOCK.txt | 24 +++++-----
doc/version.mk | 2
samples/nv-control-framelock.c | 6 +-
samples/nv-control-targets.c | 6 +-
samples/version.mk | 2
src/gtk+-2.x/ctkdisplayconfig-utils.c | 6 ++
src/gtk+-2.x/ctkframelock.c | 80 +++++++++++++++++-----------------
src/libXNVCtrl/NVCtrl.h | 2
src/libXNVCtrl/libXNVCtrl.a |binary
src/query-assign.c | 2
src/version.mk | 2
version.mk | 2
13 files changed, 78 insertions(+), 64 deletions(-)
diff -Nru nvidia-settings-304.48/debian/changelog nvidia-settings-304.51/debian/changelog
--- nvidia-settings-304.48/debian/changelog 2012-09-12 12:56:39.000000000 +0200
+++ nvidia-settings-304.51/debian/changelog 2012-09-24 19:14:33.000000000 +0200
@@ -1,3 +1,11 @@
+nvidia-settings (304.51-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Fixed a bug that sometimes caused the display layout area of the
+ nvidia-settings control panel to be laid out incorrectly.
+
+ -- Andreas Beckmann <debian@abeckmann.de> Mon, 24 Sep 2012 19:13:44 +0200
+
nvidia-settings (304.48-1) unstable; urgency=low
* New upstream release.
diff -Nru nvidia-settings-304.48/doc/FRAMELOCK.txt nvidia-settings-304.51/doc/FRAMELOCK.txt
--- nvidia-settings-304.48/doc/FRAMELOCK.txt 2012-09-10 06:34:35.000000000 +0200
+++ nvidia-settings-304.51/doc/FRAMELOCK.txt 2012-09-19 03:51:19.000000000 +0200
@@ -77,7 +77,7 @@
slaves of a Frame Lock group.
- Frame Lock attributes should now be set/queried on GPUs
- (NV_CTRL_TARGET_TYPE_GPU) and G-Sync (Frame Lock) devices
+ (NV_CTRL_TARGET_TYPE_GPU) and Quadro Sync (Frame Lock) devices
(NV_CTRL_TARGET_TYPE_FRAMELOCK) using the new NV-CONTROL targeting API.
Please see the sample NV-CONTROL clients in the "samples" directory
@@ -93,17 +93,17 @@
Querying frame lock capabilities of a system:
- - Query the number of G-Sync devices on the system by passing
+ - Query the number of Quadro Sync devices on the system by passing
NV_CTRL_TARGET_TYPE_FRAMELOCK to XNVCTRLQueryTargetCount()
- - Query the GPUs attached to each g-sync device by querying the
- NV_CTRL_GPUS_USING_FRAMELOCK attribute for each g-sync device.
+ - Query the GPUs attached to each Quadro Sync device by querying the
+ NV_CTRL_GPUS_USING_FRAMELOCK attribute for each Quadro Sync device.
- Query the enabled (available) display devices on each GPU through
the NV_CTRL_ENABLED_DISPLAYS attribute.
Configuring the Frame Lock group (This must be done while Frame Lock Sync is
-disabled on the GPU/G-Sync Device):
+disabled on the GPU/Quadro Sync Device):
- Set the Frame Lock Master Display Device on one of the GPUs through the
NV_CTRL_FRAMELOCK_MASTER attribute.
@@ -112,16 +112,16 @@
NV_CTRL_FRAMELOCK_SLAVES attribute.
- Set NV_CTRL_USE_HOUSE_SYNC to NV_CTRL_USE_HOUSE_SYNC_TRUE or
- NV_CTRL_USE_HOUSE_SYNC_FALSE on the master g-sync device (this is the
- g-sync device that is attached to the GPU that contains the display
- device currently set as the frame lock master.) Depending on whether
- or not you will be using a House Sync signal.
+ NV_CTRL_USE_HOUSE_SYNC_FALSE on the master Quadro Sync device (this is
+ the Quadro Sync device that is attached to the GPU that contains the
+ display device currently set as the frame lock master.) Depending on
+ whether or not you will be using a House Sync signal.
- - Set NV_CTRL_FRAMELOCK_POLARITY for each slave G-Sync device in the
+ - Set NV_CTRL_FRAMELOCK_POLARITY for each slave Quadro Sync device in the
cluster; most likely you want NV_CTRL_FRAMELOCK_POLARITY_RISING_EDGE.
- - Set NV_CTRL_FRAMELOCK_SYNC_DELAY as appropriate for each G-Sync device.
- Most likely you want 0.
+ - Set NV_CTRL_FRAMELOCK_SYNC_DELAY as appropriate for each Quadro Sync
+ device. Most likely you want 0.
- Set NV_CTRL_FRAMELOCK_SYNC_INTERVAL as appropriate if you
are using house sync. Most likely, you just want 0.
diff -Nru nvidia-settings-304.48/doc/version.mk nvidia-settings-304.51/doc/version.mk
--- nvidia-settings-304.48/doc/version.mk 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/doc/version.mk 2012-09-19 03:51:18.000000000 +0200
@@ -1 +1 @@
-NVIDIA_VERSION = 304.48
+NVIDIA_VERSION = 304.51
diff -Nru nvidia-settings-304.48/samples/nv-control-framelock.c nvidia-settings-304.51/samples/nv-control-framelock.c
--- nvidia-settings-304.48/samples/nv-control-framelock.c 2012-09-10 06:34:35.000000000 +0200
+++ nvidia-settings-304.51/samples/nv-control-framelock.c 2012-09-19 03:51:19.000000000 +0200
@@ -59,7 +59,7 @@
/*
* do_query()
*
- * Prints information for all frame lock (g-sync) devices found on
+ * Prints information for all frame lock (Quadro Sync) devices found on
* the given X server.
*
*/
@@ -284,7 +284,7 @@
for (i = 1; i <= data[0]; i++) {
gpu = data[i];
- printf(" - Enabling G-Sync Device %d - GPU %d... ",
+ printf(" - Enabling Quadro Sync Device %d - GPU %d... ",
framelock, gpu);
/* Make sure frame lock is disabled */
@@ -501,7 +501,7 @@
for (i = 1; i <= data[0]; i++) {
gpu = data[i];
- printf(" - Disabling G-Sync Device %d - GPU %d... ",
+ printf(" - Disabling Quadro Sync Device %d - GPU %d... ",
framelock, gpu);
XNVCTRLSetTargetAttribute(dpy,
diff -Nru nvidia-settings-304.48/samples/nv-control-targets.c nvidia-settings-304.51/samples/nv-control-targets.c
--- nvidia-settings-304.48/samples/nv-control-targets.c 2012-09-10 06:34:35.000000000 +0200
+++ nvidia-settings-304.51/samples/nv-control-targets.c 2012-09-19 03:51:19.000000000 +0200
@@ -88,7 +88,7 @@
int major, minor;
- int num_gpus, num_screens, num_gsyncs;
+ int num_gpus, num_screens, num_syncs;
int num_vcs;
int num_gvis;
int num_coolers;
@@ -159,12 +159,12 @@
/* Get the number of Frame Lock devices in the system */
ret = XNVCTRLQueryTargetCount(dpy, NV_CTRL_TARGET_TYPE_FRAMELOCK,
- &num_gsyncs);
+ &num_syncs);
if (!ret) {
fprintf(stderr, "Failed to query number of xscreens\n");
return 1;
}
- printf(" number of Frame Lock Devices: %d\n", num_gsyncs);
+ printf(" number of Frame Lock Devices: %d\n", num_syncs);
/* Get the number of Visual Computing System devices in
diff -Nru nvidia-settings-304.48/samples/version.mk nvidia-settings-304.51/samples/version.mk
--- nvidia-settings-304.48/samples/version.mk 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/samples/version.mk 2012-09-19 03:51:18.000000000 +0200
@@ -1 +1 @@
-NVIDIA_VERSION = 304.48
+NVIDIA_VERSION = 304.51
diff -Nru nvidia-settings-304.48/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-304.51/src/gtk+-2.x/ctkdisplayconfig-utils.c
--- nvidia-settings-304.48/src/gtk+-2.x/ctkdisplayconfig-utils.c 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/src/gtk+-2.x/ctkdisplayconfig-utils.c 2012-09-19 03:51:19.000000000 +0200
@@ -42,6 +42,7 @@
static void xconfig_update_buffer(GtkWidget *widget, gpointer user_data);
static gchar *display_pick_config_name(nvDisplayPtr display, int be_generic);
+static Bool screen_check_metamodes(nvScreenPtr screen);
@@ -1563,8 +1564,11 @@
/* Make the mode part of the metamode */
mode->metamode = metamode;
- /* Make the display part of the screen */
+ /* Make the display part of the screen, and make sure it has the
+ * right number of modes.
+ */
screen_link_display(screen, display);
+ screen_check_metamodes(screen);
/* Set the panning offset */
mode->pan[X] = mode->dim[X];
diff -Nru nvidia-settings-304.48/src/gtk+-2.x/ctkframelock.c nvidia-settings-304.51/src/gtk+-2.x/ctkframelock.c
--- nvidia-settings-304.48/src/gtk+-2.x/ctkframelock.c 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/src/gtk+-2.x/ctkframelock.c 2012-09-19 03:51:19.000000000 +0200
@@ -258,11 +258,11 @@
/* Tooltips */
static const char * __add_devices_button_help =
-"The Add Devices button adds to the frame lock group all G-Sync devices found "
-"on the specified X Server.";
+"The Add Devices button adds to the frame lock group all Quadro Sync devices "
+"found on the specified X Server.";
static const char * __remove_devices_button_help =
-"The Remove Devices button allows you to remove G-Sync, GPU or display "
+"The Remove Devices button allows you to remove Quadro Sync, GPU or display "
"devices from the frame lock group. Any device removed from the frame lock "
"group will no longer be controlled.";
@@ -275,8 +275,8 @@
"list.";
static const char * __use_house_sync_button_help =
-"The Use House Sync if Present checkbox tells the server G-Sync device to "
-"generate the master frame lock signal from the incoming house sync signal "
+"The Use House Sync if Present checkbox tells the server Quadro Sync device "
+"to generate the master frame lock signal from the incoming house sync signal "
"(if a house sync signal is detected) instead of using internal timing from "
"the server GPU/display device.";
@@ -292,9 +292,9 @@
static const char * __video_mode_help =
"The Video Mode drop-down allows you to select which video mode the server "
-"G-Sync device will use to decode the incoming house sync signal. On some "
-"G-Sync devices, this will be auto-detected and will be reported as "
-"read-only information.";
+"Quadro Sync device will use to decode the incoming house sync signal. On "
+"some Quadro Sync devices, this will be auto-detected and will be reported "
+"as read-only information.";
static const char * __detect_video_mode_button_help =
"The Detect Video Mode button will attempt to automatically detect the format "
@@ -308,7 +308,7 @@
static const char * __sync_enable_button_help =
"The Enable/Disable Frame Lock button will enable/disable frame lock on all "
-"devices listed in the G-Sync group. Enabling frame lock will lock the "
+"devices listed in the Quadro Sync group. Enabling frame lock will lock the "
"refresh rates of all members in the frame lock group.";
static const char * __server_checkbox_help =
@@ -894,7 +894,7 @@
/** get_framelock_name() *********************************************
*
- * Returns the name of the given frame lock (G-Sync) device.
+ * Returns the name of the given frame lock (Quadro Sync) device.
*
*/
static char *get_framelock_name(nvFrameLockDataPtr data, gboolean simple)
@@ -909,7 +909,7 @@
*/
server_name = NvCtrlGetDisplayName(data->handle);
- snprintf(tmp, 32, " (G-Sync %d)", NvCtrlGetTargetId(data->handle));
+ snprintf(tmp, 32, " (Quadro Sync %d)", NvCtrlGetTargetId(data->handle));
name = g_strconcat(server_name?server_name:"Unknown X Server", tmp, NULL);
@@ -959,7 +959,7 @@
case ENTRY_DATA_FRAMELOCK:
gtk_label_set_text(GTK_LABEL
(((nvFrameLockDataPtr)(entry->data))->label),
- str?str:"Unknown G-Sync");
+ str?str:"Unknown Quadro Sync");
break;
case ENTRY_DATA_GPU:
gtk_label_set_text(GTK_LABEL
@@ -1124,7 +1124,7 @@
/** list_entry_update_framelock_controls() ***************************
*
- * Updates a G-Sync list entry's GUI controls based on the current
+ * Updates a Quadro Sync list entry's GUI controls based on the current
* frame lock status.
*
*/
@@ -1360,7 +1360,7 @@
tree = (nvListTreePtr)(ctk_framelock->tree);
enabled = ctk_framelock->framelock_enabled;
- /* G-Sync Buttons */
+ /* Quadro Sync Buttons */
gtk_widget_set_sensitive(ctk_framelock->remove_devices_button,
tree->selected_entry != NULL);
@@ -1408,7 +1408,7 @@
gtk_widget_set_sensitive(ctk_framelock->test_link_button,
(enabled && tree->server_entry));
- /* Update the frame lock G-Sync frame */
+ /* Update the frame lock Quadro Sync frame */
list_entry_update_controls(ctk_framelock, tree->entries);
/* House Sync */
@@ -3675,10 +3675,11 @@
/* Update the Timing LED:
*
* We should disable the GPU Timing LED (which reports the sync status
- * between the GPU and the G-Sync device) when we don't care if the
- * GPU is in sync with the G-Sync device. This occurs when Frame Lock
+ * between the GPU and the Quadro Sync device) when we don't care if the
+ * GPU is in sync with the Quadro Sync device. This occurs when Frame Lock
* is disabled, or when there are no devices selected for the GPU, or
- * in cases where the GPU is driving the sync signal to the G-Sync device.
+ * in cases where the GPU is driving the sync signal to the Quadro Sync
+ * device.
*/
if (!framelock_enabled || // Frame Lock is disabled.
(!has_server && !has_client) || // No devices selected on GPU.
@@ -3820,7 +3821,7 @@
* Queries ethernet status for all frame lock devices and reports
* on any error.
*
- * XXX This assumes that the frame lock (G-Sync) devices are
+ * XXX This assumes that the frame lock (Quadro Sync) devices are
* top-level list entries, such that they are all siblings.
*
*/
@@ -4737,10 +4738,10 @@
banner = ctk_banner_image_new(BANNER_ARTWORK_FRAMELOCK);
gtk_box_pack_start(GTK_BOX(ctk_framelock), banner, FALSE, FALSE, 0);
- /* G-Sync Frame */
+ /* Quadro Sync Frame */
frame = gtk_frame_new(NULL);
- gtk_frame_set_label(GTK_FRAME(frame), "G-Sync Devices");
+ gtk_frame_set_label(GTK_FRAME(frame), "Quadro Sync Devices");
gtk_box_pack_start(GTK_BOX(ctk_framelock), frame, TRUE, TRUE, 0);
/* scrollable window */
@@ -5429,7 +5430,7 @@
ReturnStatus ret;
- /* Get number of G-Sync devices on this server */
+ /* Get number of Quadro Sync devices on this server */
ret = NvCtrlQueryTargetCount(handle,
NV_CTRL_TARGET_TYPE_FRAMELOCK,
@@ -5517,7 +5518,7 @@
update_entry_label(ctk_framelock, entry);
list_entry_update_status(ctk_framelock, entry);
- /* Add GPUs tied to this G-Sync */
+ /* Add GPUs tied to this Quadro Sync */
add_gpu_devices(ctk_framelock, entry);
if (entry->children) {
int i;
@@ -5903,16 +5904,16 @@
"manage an entire cluster of workstations in a frame lock "
"group.");
- /* G-Sync Frame Help */
+ /* Quadro Sync Frame Help */
- ctk_help_heading(b, &i, "G-Sync Section");
- ctk_help_para(b, &i, "The G-Sync section allows you to configure the "
+ ctk_help_heading(b, &i, "Quadro Sync Section");
+ ctk_help_para(b, &i, "The Quadro Sync section allows you to configure the "
"individual devices that make up the frame lock group.");
- ctk_help_heading(b, &i, "G-Sync Device Entry Information");
- ctk_help_para(b, &i, "G-Sync (frame lock board) device entries display "
- "the following information:");
- ctk_help_para(b, &i, "The X server name and G-Sync board ID.");
+ ctk_help_heading(b, &i, "Quadro Sync Device Entry Information");
+ ctk_help_para(b, &i, "Quadro Sync (frame lock board) device entries "
+ "display the following information:");
+ ctk_help_para(b, &i, "The X server name and Quadro Sync board ID.");
ctk_help_para(b, &i, "Receiving LED: This indicates whether the frame "
"lock board is receiving a sync pulse. Green means a "
"signal is detected; red means a signal is not detected. "
@@ -5936,11 +5937,11 @@
ctk_help_heading(b, &i, "GPU Device Entry Information");
ctk_help_para(b, &i, "GPU Device entries display the GPU name and number "
- "of a GPU connected to a G-Sync device. Display devices "
- "driven by the GPU will be listed under this entry.");
+ "of a GPU connected to a Quadro Sync device. Display "
+ "devices driven by the GPU will be listed under this entry.");
ctk_help_para(b, &i, "Timing LED: This indicates that the GPU "
"is synchronized with the incoming timing signal from the "
- "G-Sync device");
+ "Quadro Sync device");
ctk_help_heading(b, &i, "Display Device Entry Information");
ctk_help_para(b, &i, "Display Device entries display information and "
@@ -5952,9 +5953,9 @@
ctk_help_para(b, &i, __client_checkbox_help);
ctk_help_para(b, &i, "Stereo LED: This indicates whether or not the "
"display device is sync'ed to the stereo signal coming from "
- "the G-Sync device. This LED is only available to display "
- "devices set as clients when frame lock is enabled. The "
- "Stereo LED is dependent on the parent GPU being in sync "
+ "the Quadro Sync device. This LED is only available to "
+ "display devices set as clients when frame lock is enabled. "
+ "The Stereo LED is dependent on the parent GPU being in sync "
"with the input timing signal.");
ctk_help_heading(b, &i, "Adding Devices");
@@ -5970,7 +5971,7 @@
ctk_help_heading(b, &i, "House Sync Section");
ctk_help_para(b, &i, "The House Sync section allows you to configure "
- "the selected server G-Sync board for using an incoming "
+ "the selected server Quadro Sync board for using an incoming "
"house sync signal instead of internal GPU timings. This "
"section is only accesible by selecting a server display "
"device (See Display Device Information above.");
@@ -5978,8 +5979,9 @@
ctk_help_heading(b, &i, "Use House Sync on Server");
ctk_help_para(b, &i, __use_house_sync_button_help);
ctk_help_para(b, &i, "If this option is checked and no house signal "
- "is detected (House LED is red), the G-Sync device will "
- "fall back to using internal timings from the primary GPU.");
+ "is detected (House LED is red), the Quadro Sync device "
+ "will fall back to using internal timings from the primary "
+ "GPU.");
ctk_help_heading(b, &i, "Sync Interval");
ctk_help_para(b, &i, __sync_interval_scale_help);
diff -Nru nvidia-settings-304.48/src/libXNVCtrl/NVCtrl.h nvidia-settings-304.51/src/libXNVCtrl/NVCtrl.h
--- nvidia-settings-304.48/src/libXNVCtrl/NVCtrl.h 2012-09-10 06:34:35.000000000 +0200
+++ nvidia-settings-304.51/src/libXNVCtrl/NVCtrl.h 2012-09-19 03:51:19.000000000 +0200
@@ -449,7 +449,7 @@
* USAGE NODE: NV_CTRL_FRAMELOCK_SYNC_DELAY_MAX and
* NV_CTRL_FRAMELOCK_SYNC_DELAY_FACTOR are deprecated.
* The Sync Delay _MAX and _FACTOR are different for different
- * GSync products and so, to be correct, the valid values for
+ * Quadro Sync products and so, to be correct, the valid values for
* NV_CTRL_FRAMELOCK_SYNC_DELAY must be queried to get the range
* of acceptable sync delay values, and
* NV_CTRL_FRAMELOCK_SYNC_DELAY_RESOLUTION must be queried to
Binary files /tmp/h5VLU1KKOy/nvidia-settings-304.48/src/libXNVCtrl/libXNVCtrl.a and /tmp/rs84nulIvp/nvidia-settings-304.51/src/libXNVCtrl/libXNVCtrl.a differ
diff -Nru nvidia-settings-304.48/src/query-assign.c nvidia-settings-304.51/src/query-assign.c
--- nvidia-settings-304.48/src/query-assign.c 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/src/query-assign.c 2012-09-19 03:51:19.000000000 +0200
@@ -1449,7 +1449,7 @@
/* for framelock, create the product name */
product_name = malloc(32);
- snprintf(product_name, 32, "G-Sync %d", i);
+ snprintf(product_name, 32, "Quadro Sync %d", i);
} else if (target_index == VCS_TARGET) {
diff -Nru nvidia-settings-304.48/src/version.mk nvidia-settings-304.51/src/version.mk
--- nvidia-settings-304.48/src/version.mk 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/src/version.mk 2012-09-19 03:51:18.000000000 +0200
@@ -1 +1 @@
-NVIDIA_VERSION = 304.48
+NVIDIA_VERSION = 304.51
diff -Nru nvidia-settings-304.48/version.mk nvidia-settings-304.51/version.mk
--- nvidia-settings-304.48/version.mk 2012-09-10 06:34:34.000000000 +0200
+++ nvidia-settings-304.51/version.mk 2012-09-19 03:51:18.000000000 +0200
@@ -1 +1 @@
-NVIDIA_VERSION = 304.48
+NVIDIA_VERSION = 304.51
--- End Message ---