drm/amdgpu/vce1: Don't repeat GTT MGR node allocation

Only allocate entries from the GTT manager when the
VCE GTT node is not allocated yet. This prevents the
possibility of allocating them multiple times, which
causes issues during GPU reset and suspend/resume.

Fixes: 71aec08f80e7 ("amdgpu/vce: use amdgpu_gtt_mgr_alloc_entries")
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v1_0.c
index a49f11b..92c3cf3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vce_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v1_0.c
@@ -545,11 +545,13 @@ static int vce_v1_0_ensure_vcpu_bo_32bit_addr(struct amdgpu_device *adev)
        if (adev->gmc.vram_start < adev->gmc.gart_start)
                return amdgpu_bo_gpu_offset(adev->vce.vcpu_bo) <= max_vcpu_bo_addr ? 0 : -EINVAL;
 
-       r = amdgpu_gtt_mgr_alloc_entries(&adev->mman.gtt_mgr,
-                                        &adev->vce.gart_node, num_pages,
-                                        DRM_MM_INSERT_LOW);
-       if (r)
-               return r;
+       if (!drm_mm_node_allocated(&adev->vce.gart_node)) {
+               r = amdgpu_gtt_mgr_alloc_entries(&adev->mman.gtt_mgr,
+                                                &adev->vce.gart_node, num_pages,
+                                                DRM_MM_INSERT_LOW);
+               if (r)
+                       return r;
+       }
 
        vce_gart_start_offs = amdgpu_gtt_node_to_byte_offset(&adev->vce.gart_node);