diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-06-20 11:50:41 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-20 11:50:41 -0400 |
| commit | b15cdca5b5de52dc2262c41917e8727b96b30fb0 (patch) | |
| tree | f61c45517b1763e40ebc1d2fbed3af906281ead5 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes (diff) | |
| parent | Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
| download | wireguard-linux-b15cdca5b5de52dc2262c41917e8727b96b30fb0.tar.xz wireguard-linux-b15cdca5b5de52dc2262c41917e8727b96b30fb0.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerging airlied/drm-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 365883d7948d..8ee69652be8c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -960,6 +960,7 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) return -EINVAL; /* hurrah the memory is not visible ! */ + atomic64_inc(&adev->num_vram_cpu_page_faults); amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM); lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT; for (i = 0; i < abo->placement.num_placement; i++) { |