mirror of
https://github.com/keylase/nvidia-patch.git
synced 2025-08-19 21:03:12 -07:00
Merge d2f0370f35
into cb35863ed7
This commit is contained in:
commit
7c84c2972e
2 changed files with 59 additions and 34 deletions
15
patch-fbc.sh
15
patch-fbc.sh
|
@ -267,16 +267,18 @@ get_supported_versions () {
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_common () {
|
patch_common () {
|
||||||
NVIDIA_SMI="$(command -v nvidia-smi || true)"
|
|
||||||
if [[ ! "$NVIDIA_SMI" ]] ; then
|
|
||||||
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$manual_driver_version" ]]; then
|
if [[ "$manual_driver_version" ]]; then
|
||||||
driver_version="$manual_driver_version"
|
driver_version="$manual_driver_version"
|
||||||
|
|
||||||
echo "Using manually entered nvidia driver version: $driver_version"
|
echo "Using manually entered nvidia driver version: $driver_version"
|
||||||
|
|
||||||
|
else
|
||||||
|
# Try to detect nvidia-smi, but don't exit if it's not found
|
||||||
|
NVIDIA_SMI="$(command -v nvidia-smi || true)"
|
||||||
|
|
||||||
|
if [[ ! "$NVIDIA_SMI" ]] ; then
|
||||||
|
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||||
driver_versions_list=$($cmd) || (
|
driver_versions_list=$($cmd) || (
|
||||||
|
@ -291,6 +293,7 @@ patch_common () {
|
||||||
|
|
||||||
echo "Detected nvidia driver version: $driver_version"
|
echo "Detected nvidia driver version: $driver_version"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if ! check_version_supported "$driver_version" ; then
|
if ! check_version_supported "$driver_version" ; then
|
||||||
echo "Patch for this ($driver_version) nvidia driver not found."
|
echo "Patch for this ($driver_version) nvidia driver not found."
|
||||||
|
|
32
patch.sh
32
patch.sh
|
@ -305,16 +305,31 @@ get_supported_versions () {
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_common () {
|
patch_common () {
|
||||||
|
if [[ "$manual_driver_version" ]]; then
|
||||||
|
driver_version="$manual_driver_version"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
echo "Using manually entered nvidia driver version: $driver_version"
|
||||||
|
|
||||||
|
=======
|
||||||
|
|
||||||
|
echo "Using manually entered Nvidia driver version: $driver_version"
|
||||||
|
else
|
||||||
|
|
||||||
NVIDIA_SMI="$(command -v nvidia-smi || true)"
|
NVIDIA_SMI="$(command -v nvidia-smi || true)"
|
||||||
|
|
||||||
if [[ ! "$NVIDIA_SMI" ]] ; then
|
if [[ ! "$NVIDIA_SMI" ]] ; then
|
||||||
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$manual_driver_version" ]]; then
|
>>>>>>> parent of ff838cf (Update patch.sh)
|
||||||
driver_version="$manual_driver_version"
|
else
|
||||||
|
# Try to detect nvidia-smi, but don't exit if it's not found
|
||||||
|
NVIDIA_SMI="$(command -v nvidia-smi || true)"
|
||||||
|
|
||||||
echo "Using manually entered nvidia driver version: $driver_version"
|
if [[ ! "$NVIDIA_SMI" ]] ; then
|
||||||
|
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||||
driver_versions_list=$($cmd) || (
|
driver_versions_list=$($cmd) || (
|
||||||
|
@ -327,8 +342,15 @@ patch_common () {
|
||||||
)
|
)
|
||||||
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
echo "Detected nvidia driver version: $driver_version"
|
echo "Detected nvidia driver version: $driver_version"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
=======
|
||||||
|
echo "Detected nvidia driver version: $driver_version"
|
||||||
|
|
||||||
|
fi
|
||||||
|
>>>>>>> parent of ff838cf (Update patch.sh)
|
||||||
|
|
||||||
if ! check_version_supported "$driver_version" ; then
|
if ! check_version_supported "$driver_version" ; then
|
||||||
echo "Patch for this ($driver_version) nvidia driver not found."
|
echo "Patch for this ($driver_version) nvidia driver not found."
|
||||||
|
@ -376,9 +398,9 @@ patch_common () {
|
||||||
done
|
done
|
||||||
|
|
||||||
[[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; }
|
[[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ensure_bytes_are_valid () {
|
ensure_bytes_are_valid () {
|
||||||
driver_file="$driver_dir/$object.$driver_version"
|
driver_file="$driver_dir/$object.$driver_version"
|
||||||
original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch")
|
original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue