diff options
| author | Dave Airlie <[email protected]> | 2018-07-16 09:45:56 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2018-07-16 09:46:21 +1000 |
| commit | e280057762cd553a6863b7e3a73f5040ed879a15 (patch) | |
| tree | 83f236166cf775321afab3a9dcbbe3432c72d825 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | f88147e4e1c2268a38aea326573f533652ee2314 (diff) | |
| parent | 02ce6ce2e1d07e31e8314c761a2caa087ea094ce (diff) | |
Merge branch 'drm-fixes-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
A few display and GPUVM fixes for 4.18.
A few more fixes for 4.18. Two display fixes and a fix to avoid a segfault if
the GPU does not power up properly on resume. These are on top of my pull
from earlier this week.
Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 82312a7bc6ad..9c85a90be293 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -927,6 +927,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, r = amdgpu_bo_vm_update_pte(p); if (r) return r; + + r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv); + if (r) + return r; } return amdgpu_cs_sync_rings(p); |