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_ttm.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_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index ab34190859a8..f1a55d1888cb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -384,9 +384,15 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) { struct amdgpu_device *adev; + struct amdgpu_bo *abo; struct ttm_mem_reg *old_mem = &bo->mem; int r; + /* Can't move a pinned BO */ + abo = container_of(bo, struct amdgpu_bo, tbo); + if (WARN_ON_ONCE(abo->pin_count > 0)) + return -EINVAL; + adev = amdgpu_get_adev(bo->bdev); if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) { amdgpu_move_null(bo, new_mem); |