diff options
| author | Dave Airlie <[email protected]> | 2019-11-25 22:40:23 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-11-25 22:40:23 +0000 |
| commit | acc61b8929365e63a3e8c8c8913177795aa45594 (patch) | |
| tree | dca764adfabd0e77f354f0d9fec453939d50616d /drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | |
| parent | Merge tag 'drm-intel-next-fixes-2019-11-22' of git://anongit.freedesktop.org/... (diff) | |
| parent | drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10 (diff) | |
| download | kernel-acc61b8929365e63a3e8c8c8913177795aa45594.tar.gz kernel-acc61b8929365e63a3e8c8c8913177795aa45594.zip | |
Merge tag 'drm-next-5.5-2019-11-22' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-22:
amdgpu:
- Fix bad DMA on some PPC platforms
- MMHUB fix for powergating
- BACO fix for Navi
- Misc raven fixes
- Enable vbios fetch directly from rom on navi
- debugfs fix for DC
- SR-IOV fixes for arcturus
- Misc power fixes
radeon:
- Fix bad DMA on some PPC platforms
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_gfx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c index c9d1fada6188..e00b46180d2e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -454,8 +454,6 @@ void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev) } ring = &adev->gfx.kiq.ring; - if (adev->asic_type >= CHIP_NAVI10 && amdgpu_async_gfx_ring) - kfree(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS]); kfree(adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS]); amdgpu_bo_free_kernel(&ring->mqd_obj, &ring->mqd_gpu_addr, |