diff --git a/sys/dev/drm/amd/amdgpu/amdgpu_gfx.c b/sys/dev/drm/amd/amdgpu/amdgpu_gfx.c
--- a/sys/dev/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/sys/dev/drm/amd/amdgpu/amdgpu_gfx.c
@@ -361,10 +361,11 @@
 	struct amdgpu_ring *ring = NULL;
 	int i;
 
-	for (i = 0; i < adev->gfx.num_compute_rings; i++) {
-		ring = &adev->gfx.compute_ring[i];
-		kfree(adev->gfx.mec.mqd_backup[i]);
-		amdgpu_bo_free_kernel(&ring->mqd_obj,
+	for (i = 0; i < adev->gfx.num_compute_rings; i++) {
+		ring = &adev->gfx.compute_ring[i];
+		kfree(adev->gfx.mec.mqd_backup[i]);
+		adev->gfx.mec.mqd_backup[i] = NULL;
+		amdgpu_bo_free_kernel(&ring->mqd_obj,
 				      (u64 *)&ring->mqd_gpu_addr,
 				      &ring->mqd_ptr);
 	}