diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
| commit | 08556e03ad36b2c6219aba90de88ccf58038e208 (patch) | |
| tree | 1619cc5f466534b66b351985526e82da32b52028 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | d1480f9b535fa3901b7f303959bc196b304472a9 (diff) | |
| parent | 6ba89b52ba6916bc7a3d390d70951e992c0ca39e (diff) | |
Merge tag 'v4.9.101' into linux-linaro-lsk-v4.9
This is the 4.9.101 stable release
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index cb505f66d3aa..c801624f33bd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -519,7 +519,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, INIT_LIST_HEAD(&duplicates); amdgpu_vm_get_pd_bo(&fpriv->vm, &p->validated, &p->vm_pd); - if (p->uf_entry.robj) + if (p->uf_entry.robj && !p->uf_entry.robj->parent) list_add(&p->uf_entry.tv.head, &p->validated); if (need_mmap_lock) |