3 files changed, 11 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/common/linux/debug_fifo.c
index a240a138..1763eb7e 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_fifo.c
@@ -167,7 +167,7 @@ static int gk20a_fifo_profile_enable(void *data, u64 val)
                                 }
                                 kref_init(&f->profile.ref);
                         }
-                        atomic_set(&f->profile.get, 0);
+                        atomic_set(&f->profile.get.atomic_var, 0);
                         f->profile.enabled = true;
                 }
         }
@@ -246,7 +246,7 @@ static int gk20a_fifo_profile_stats(struct seq_file *s, void *unused)
                 return 0;
         }
 
-        get = atomic_read(&g->fifo.profile.get);
+        get = atomic_read(&g->fifo.profile.get.atomic_var);
 
         __gk20a_fifo_create_stats(g, percentiles_ioctl,
                 PROFILE_IOCTL_EXIT, PROFILE_IOCTL_ENTRY);
@@ -311,7 +311,7 @@ void gk20a_fifo_debugfs_init(struct gk20a *g)
 
         nvgpu_mutex_init(&g->fifo.profile.lock);
         g->fifo.profile.enabled = false;
-        atomic_set(&g->fifo.profile.get, 0);
+        atomic_set(&g->fifo.profile.get.atomic_var, 0);
         atomic_set(&g->fifo.profile.ref.refcount, 0);
 
         debugfs_create_file("enable", 0600, profile_root, g,
@@ -342,7 +342,7 @@ struct fifo_profile_gk20a *gk20a_fifo_profile_acquire(struct gk20a *g)
         /* If kref is zero, profiling is not enabled */
         if (!kref_get_unless_zero(&f->profile.ref))
                 return NULL;
-        index = atomic_inc_return(&f->profile.get);
+        index = atomic_inc_return(&f->profile.get.atomic_var);
         profile = &f->profile.data[index % FIFO_PROFILING_ENTRIES];
 
         return profile;
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index ea5b2837..2116053d 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -197,7 +197,7 @@ int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags,
         WARN_ON(flags != NVGPU_DMA_NO_KERNEL_MAPPING);
 
         nvgpu_mutex_acquire(&g->mm.vidmem.clear_list_mutex);
-        before_pending = atomic64_read(&g->mm.vidmem.bytes_pending);
+        before_pending = atomic64_read(&g->mm.vidmem.bytes_pending.atomic_var);
         addr = __nvgpu_dma_alloc(vidmem_alloc, at, size);
         nvgpu_mutex_release(&g->mm.vidmem.clear_list_mutex);
         if (!addr) {
@@ -394,7 +394,7 @@ static void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem)
                 was_empty = nvgpu_list_empty(&g->mm.vidmem.clear_list_head);
                 nvgpu_list_add_tail(&mem->clear_list_entry,
                               &g->mm.vidmem.clear_list_head);
-                atomic64_add(mem->size, &g->mm.vidmem.bytes_pending);
+                atomic64_add(mem->size, &g->mm.vidmem.bytes_pending.atomic_var);
                 nvgpu_mutex_release(&g->mm.vidmem.clear_list_mutex);
 
                 if (was_empty) {
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index bfbe7a58..f5c6ca1f 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -68,13 +68,13 @@ int gk20a_busy(struct gk20a *g)
         if (!g)
                 return -ENODEV;
 
-        atomic_inc(&g->usage_count);
+        atomic_inc(&g->usage_count.atomic_var);
 
         down_read(&g->busy_lock);
 
         if (!gk20a_can_busy(g)) {
                 ret = -ENODEV;
-                atomic_dec(&g->usage_count);
+                atomic_dec(&g->usage_count.atomic_var);
                 goto fail;
         }
 
@@ -87,7 +87,7 @@ int gk20a_busy(struct gk20a *g)
                         /* Mark suspended so runtime pm will retry later */
                         pm_runtime_set_suspended(dev);
                         pm_runtime_put_noidle(dev);
-                        atomic_dec(&g->usage_count);
+                        atomic_dec(&g->usage_count.atomic_var);
                         goto fail;
                 }
         } else {
@@ -97,7 +97,7 @@ int gk20a_busy(struct gk20a *g)
                                 vgpu_pm_finalize_poweron(dev)
                                 : gk20a_pm_finalize_poweron(dev);
                         if (ret) {
-                                atomic_dec(&g->usage_count);
+                                atomic_dec(&g->usage_count.atomic_var);
                                 nvgpu_mutex_release(&g->poweron_lock);
                                 goto fail;
                         }
@@ -120,7 +120,7 @@ void gk20a_idle(struct gk20a *g)
 {
         struct device *dev;
 
-        atomic_dec(&g->usage_count);
+        atomic_dec(&g->usage_count.atomic_var);
 
         dev = dev_from_gk20a(g);