Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NVIDIA/nvidia-settings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 375.10
Choose a base ref
...
head repository: NVIDIA/nvidia-settings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e7e4bb3464802f35b924d4fd3cdfb1e7b2bd125
Choose a head ref
  • 8 commits
  • 8 files changed
  • 3 contributors

Commits on Oct 28, 2016

  1. Return early if renderer functions are called before settings object … 

    …is set.

Some environment configuration can trigger renderer function on GtkTreeView
objects before they are properly configured on the Application Profiles page.
Currently this behavior causes a segfault. These changes cause the renderer
functions to return early in this case. Subsequent calls to modify the stored
data will re-trigger these renderer functions and will then run as expected.
    @aaronp24
    Jonathan Waddell authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    5a40f4d View commit details
    Browse the repository at this point in the history

  2. Remove the Enable Tooltips option since it doesn't work with GTK 2.12… 

    ….0 and higher

GTK 2.12 change how tooltips are handled internal to GTK. This addition, while
leaving the function interface, changed the internals and made the old
enable/disable and set_delay functions as No-Ops.

This change removes the configuration option from the config page for all
version of GTK. GTK 3.x only uses the later version of tooltips and is
functioanlly uneffected by this change.
    @aaronp24
    Jonathan Waddell authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    00a066e View commit details
    Browse the repository at this point in the history

  3. matchNvCtrlWithNvmlIds will fail if mismatch between gpu UUID returne… 

    …d by NV-CONTROL and NVML.
    @aaronp24
    Sachin Chitte authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    df74e57 View commit details
    Browse the repository at this point in the history

  4. nvidia-settings: Fix error checking in matchNvCtrlWithNvmlIds() 

    Commit 7155801 interpreted the return type of
XNVCTRLQueryTargetCount() as a ReturnStatus (where NvCtrlSuccess is 0, and
non-success values are > 0).  However, XNVCTRLQueryTargetCount() returns a
boolean.  This caused matchNvCtrlWithNvmlIds() to interpret TRUE as not
ReturnStatus and return prematurely.
    @aritger @aaronp24
    aritger authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    0cd4c94 View commit details
    Browse the repository at this point in the history

  5. nvidia-settings: dlopen(3) libnvidia-ml.so.1 

    To avoid link-time dependence on nvml development packages, dlopen(3)/dlclose(3)
libnvidia-ml.so.1, instead of linking against libnvidia-ml.so at link-time.

Details:

* Remove __isNvmlLoaded/__nvmlUsers bookkeeping.  The NVML implementation
  does its own reference counting such that nvmlShutdown() doesn't tear things
  down until the process-wide reference count reaches zero.

* But, be careful to still return NvCtrlMissingExtension in the cases where
  __isNvmlLoaded would have caused us to return NvCtrlMissingExtension.

Bonus:

* Allocate nvml->{sensor,cooler}CountPerGPU with nvalloc(), not calloc().
  nvalloc() will abort the process if there is an allocation failure, and takes
  care of zero-initializing the memory.
    @aritger @aaronp24
    aritger authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    68c039c View commit details
    Browse the repository at this point in the history

  6. nvidia-settings: Reduce h->nvml-> pointer chasing 

    Now that various functions in NvCtrlAttributesNvml.c have a local
NvCtrlNvmlAttributes pointer variable.  Use that, instead of h->nvml.
    @aritger @aaronp24
    aritger authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    7ced6bb View commit details
    Browse the repository at this point in the history

  7. nvidia-settings: Bundle nvml.h 

    Not many distros distribute an nvml development package that would include
nvml.h (or libnvidia-ml.so), so having external build time dependence on nvml is
cumbersome.

Avoid this by including an nvml.h with the nvidia-settings source tarball.
    @aritger @aaronp24
    aritger authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    168e17f View commit details
    Browse the repository at this point in the history

  8. nvidia-settings: Silently ignore the "ToolTips" rc property 

    Commit 00a066e removed the "ToolTips" rc
property, because most GTK versions no longer support toggling tooltips off and
on in the same way.

However, when running a post-00a066e2 nvidia-settings with an rc file produced
pre-21288711, the new nvidia-settings will print an error:

   ERROR: Error parsing configuration file '/home/aritger/.nvidia-settings-rc' on
      line 11: 'ToolTips = Yes' (Unrecognized attribute name).

Update nvidia-settings to silently ignore the "ToolTips" property, rather than
complain about it.
    @aritger @aaronp24
    aritger authored and aaronp24 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    5e7e4bb View commit details
    Browse the repository at this point in the history
Loading