Merge tag 'drm-for-v4.15-part2' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gem.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 14aff2f15a946007ff1ebfb5a404bb81056e5658..e87eedcc0da9d5363d7742782281683d6bb842dd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -351,7 +351,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
        return 0;
 
 free_pages:
-       release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages, false);
+       release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages);
 
 release_object:
        drm_gem_object_put_unlocked(gobj);
@@ -787,11 +787,11 @@ static int amdgpu_debugfs_gem_bo_info(int id, void *ptr, void *data)
        seq_printf(m, "\t0x%08x: %12ld byte %s",
                   id, amdgpu_bo_size(bo), placement);
 
-       offset = ACCESS_ONCE(bo->tbo.mem.start);
+       offset = READ_ONCE(bo->tbo.mem.start);
        if (offset != AMDGPU_BO_INVALID_OFFSET)
                seq_printf(m, " @ 0x%010Lx", offset);
 
-       pin_count = ACCESS_ONCE(bo->pin_count);
+       pin_count = READ_ONCE(bo->pin_count);
        if (pin_count)
                seq_printf(m, " pin count %d", pin_count);
        seq_printf(m, "\n");