drm/amdgpu: skip VM inv eng assignment for mes ring
authorLe Ma <le.ma@amd.com>
Fri, 20 Mar 2020 11:28:52 +0000 (19:28 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Jul 2020 05:59:11 +0000 (01:59 -0400)
Statically allocated VM inv eng of gfxhub on sienna_cichlid is used up.
Also VM inv eng is no need for mes ring.

Signed-off-by: Le Ma <le.ma@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_gmc.c

index acabb57aa8af9e8007e49dc17b53071ed40f65eb..34cbd6f6a56b7864f95eb1ad62cf1112b3e51d1e 100644 (file)
@@ -357,6 +357,9 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev)
                ring = adev->rings[i];
                vmhub = ring->funcs->vmhub;
 
+               if (ring == &adev->mes.ring)
+                       continue;
+
                inv_eng = ffs(vm_inv_engs[vmhub]);
                if (!inv_eng) {
                        dev_err(adev->dev, "no VM inv eng for ring %s\n",