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
37
patch-fbc.sh
37
patch-fbc.sh
|
@ -267,31 +267,34 @@ get_supported_versions () {
|
|||
}
|
||||
|
||||
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
|
||||
driver_version="$manual_driver_version"
|
||||
|
||||
echo "Using manually entered nvidia driver version: $driver_version"
|
||||
|
||||
else
|
||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||
driver_versions_list=$($cmd) || (
|
||||
ret_code=$?
|
||||
echo "Can not detect nvidia driver version."
|
||||
echo "CMD: \"$cmd\""
|
||||
echo "Result: \"$driver_versions_list\""
|
||||
echo "nvidia-smi retcode: $ret_code"
|
||||
# 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
|
||||
)
|
||||
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
||||
else
|
||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||
driver_versions_list=$($cmd) || (
|
||||
ret_code=$?
|
||||
echo "Can not detect nvidia driver version."
|
||||
echo "CMD: \"$cmd\""
|
||||
echo "Result: \"$driver_versions_list\""
|
||||
echo "nvidia-smi retcode: $ret_code"
|
||||
exit 1
|
||||
)
|
||||
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
||||
|
||||
echo "Detected nvidia driver version: $driver_version"
|
||||
echo "Detected nvidia driver version: $driver_version"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if ! check_version_supported "$driver_version" ; then
|
||||
echo "Patch for this ($driver_version) nvidia driver not found."
|
||||
echo "Patch is available for versions: "
|
||||
|
|
56
patch.sh
56
patch.sh
|
@ -305,30 +305,52 @@ get_supported_versions () {
|
|||
}
|
||||
|
||||
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)"
|
||||
|
||||
if [[ ! "$NVIDIA_SMI" ]] ; then
|
||||
echo 'nvidia-smi utility not found. Probably driver is not installed.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$manual_driver_version" ]]; then
|
||||
driver_version="$manual_driver_version"
|
||||
|
||||
echo "Using manually entered nvidia driver version: $driver_version"
|
||||
|
||||
>>>>>>> parent of ff838cf (Update patch.sh)
|
||||
else
|
||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||
driver_versions_list=$($cmd) || (
|
||||
ret_code=$?
|
||||
echo "Can not detect nvidia driver version."
|
||||
echo "CMD: \"$cmd\""
|
||||
echo "Result: \"$driver_versions_list\""
|
||||
echo "nvidia-smi retcode: $ret_code"
|
||||
# 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
|
||||
)
|
||||
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
||||
else
|
||||
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
|
||||
driver_versions_list=$($cmd) || (
|
||||
ret_code=$?
|
||||
echo "Can not detect nvidia driver version."
|
||||
echo "CMD: \"$cmd\""
|
||||
echo "Result: \"$driver_versions_list\""
|
||||
echo "nvidia-smi retcode: $ret_code"
|
||||
exit 1
|
||||
)
|
||||
driver_version=$(echo "$driver_versions_list" | head -n 1)
|
||||
|
||||
echo "Detected nvidia driver version: $driver_version"
|
||||
<<<<<<< HEAD
|
||||
echo "Detected nvidia driver version: $driver_version"
|
||||
fi
|
||||
fi
|
||||
=======
|
||||
echo "Detected nvidia driver version: $driver_version"
|
||||
|
||||
fi
|
||||
>>>>>>> parent of ff838cf (Update patch.sh)
|
||||
|
||||
if ! check_version_supported "$driver_version" ; then
|
||||
echo "Patch for this ($driver_version) nvidia driver not found."
|
||||
|
@ -376,9 +398,9 @@ patch_common () {
|
|||
done
|
||||
|
||||
[[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
ensure_bytes_are_valid () {
|
||||
driver_file="$driver_dir/$object.$driver_version"
|
||||
original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue