drm/amdgpu/gfx10: fix out-of-bound mqd_backup array access
authorXiaojie Yuan <xiaojie.yuan@amd.com>
Fri, 22 Nov 2019 19:21:15 +0000 (14:21 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 22 Nov 2019 19:22:56 +0000 (14:22 -0500)
Fixes: 0bb419c76b3150 ("drm/amdgpu/gfx10: fix mqd backup/restore for gfx rings (v2)")
Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

index f063a5c..e00b461 100644 (file)
@@ -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 - 1]);
        kfree(adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS]);
        amdgpu_bo_free_kernel(&ring->mqd_obj,
                              &ring->mqd_gpu_addr,