diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
| commit | 19e831b272e6db5884be085be66e44da975c73a9 (patch) | |
| tree | 8812543bc66dc531e4720f5119107e7de3447a46 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | 6f40fed1c911f218e1e189a404b26ef19effabb5 (diff) | |
| parent | 571afb4c8a4bbe88541364e7f6827340562f2736 (diff) | |
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 151a2d42c639..56d1458393cc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -608,6 +608,10 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) if ((offset + size) <= adev->mc.visible_vram_size) return 0; + /* Can't move a pinned BO to visible VRAM */ + if (abo->pin_count > 0) + return -EINVAL; + /* hurrah the memory is not visible ! */ amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM); lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT; |