diff options
| author | Dave Airlie <[email protected]> | 2019-11-13 22:43:06 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-11-13 22:43:07 +0000 |
| commit | 0990ca235d9145ec40ed002f8ff7f6e1a910db4f (patch) | |
| tree | f3b622905180952f792411641c39fd433d839f9c /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |
| parent | Merge v5.4-rc7 into drm-next (diff) | |
| parent | drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table (diff) | |
| download | kernel-0990ca235d9145ec40ed002f8ff7f6e1a910db4f.tar.gz kernel-0990ca235d9145ec40ed002f8ff7f6e1a910db4f.zip | |
Merge tag 'drm-next-5.5-2019-11-08' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-08:
amdgpu:
- Enable VCN dynamic powergating on RV/RV2
- Fixes for Navi14
- Misc Navi fixes
- Fix MSI-X tear down
- Misc Arturus fixes
- Fix xgmi powerstate handling
- Documenation fixes
scheduler:
- Fix static code checker warning
- Fix possible thread reactivation while thread is stopped
- Avoid cleanup if thread is parked
radeon:
- SI dpm fix ported from amdgpu
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c index b66d29d5ffa2..b158230af8db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c @@ -138,6 +138,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) } dma_fence_put(fence); + fence = NULL; r = amdgpu_bo_kmap(vram_obj, &vram_map); if (r) { @@ -183,6 +184,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) } dma_fence_put(fence); + fence = NULL; r = amdgpu_bo_kmap(gtt_obj[i], >t_map); if (r) { |