mirror of
https://github.com/NVIDIA/open-gpu-kernel-modules.git
synced 2026-02-23 16:34:00 +00:00
580.94.16
This commit is contained in:
@@ -229,7 +229,11 @@ static int nv_resize_pcie_bars(struct pci_dev *pci_dev) {
|
||||
|
||||
resize:
|
||||
/* Attempt to resize BAR1 to the largest supported size */
|
||||
#if defined(NV_PCI_RESIZE_RESOURCE_HAS_EXCLUDE_BARS_ARG)
|
||||
r = pci_resize_resource(pci_dev, NV_GPU_BAR1, requested_size, 0);
|
||||
#else
|
||||
r = pci_resize_resource(pci_dev, NV_GPU_BAR1, requested_size);
|
||||
#endif
|
||||
|
||||
if (r) {
|
||||
if (r == -ENOSPC)
|
||||
@@ -420,6 +424,12 @@ nv_init_coherent_link_info
|
||||
if (device_property_read_u64(nvl->dev, "nvidia,gpu-mem-base-pa", &pa) == 0)
|
||||
{
|
||||
nvl->coherent_link_info.gpu_mem_pa = pa;
|
||||
|
||||
NvU64 gpu_mem_size;
|
||||
if (device_property_read_u64(nvl->dev, "nvidia,gpu-mem-size", &gpu_mem_size) == 0)
|
||||
{
|
||||
nvl->coherent_link_info.gpu_mem_size = gpu_mem_size;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1774,7 +1784,7 @@ nv_pci_remove(struct pci_dev *pci_dev)
|
||||
* For eGPU, fall off the bus along with clients active is a valid scenario.
|
||||
* Hence skipping the sanity check for eGPU.
|
||||
*/
|
||||
if ((NV_ATOMIC_READ(nvl->usage_count) != 0) && !(nv->is_external_gpu))
|
||||
if ((atomic64_read(&nvl->usage_count) != 0) && !(nv->is_external_gpu))
|
||||
{
|
||||
nv_printf(NV_DBG_ERRORS,
|
||||
"NVRM: Attempting to remove device %04x:%02x:%02x.%x with non-zero usage count!\n",
|
||||
@@ -1785,7 +1795,7 @@ nv_pci_remove(struct pci_dev *pci_dev)
|
||||
* We can't return from this function without corrupting state, so we wait for
|
||||
* the usage count to go to zero.
|
||||
*/
|
||||
while (NV_ATOMIC_READ(nvl->usage_count) != 0)
|
||||
while (atomic64_read(&nvl->usage_count) != 0)
|
||||
{
|
||||
|
||||
/*
|
||||
@@ -1863,7 +1873,7 @@ nv_pci_remove(struct pci_dev *pci_dev)
|
||||
nvl->sysfs_config_file = NULL;
|
||||
}
|
||||
|
||||
if (NV_ATOMIC_READ(nvl->usage_count) == 0)
|
||||
if (atomic64_read(&nvl->usage_count) == 0)
|
||||
{
|
||||
nv_lock_destroy_locks(sp, nv);
|
||||
}
|
||||
@@ -1879,7 +1889,7 @@ nv_pci_remove(struct pci_dev *pci_dev)
|
||||
|
||||
num_nv_devices--;
|
||||
|
||||
if (NV_ATOMIC_READ(nvl->usage_count) == 0)
|
||||
if (atomic64_read(&nvl->usage_count) == 0)
|
||||
{
|
||||
NV_PCI_DISABLE_DEVICE(pci_dev);
|
||||
NV_KFREE(nvl, sizeof(nv_linux_state_t));
|
||||
|
||||
Reference in New Issue
Block a user