drm/amd/amdgpu: reserve vm invalidation engine for uni_mes

commit 971fb57429df5aa4e6efc796f7841e0d10b1e83c upstream.

Reserve vm invalidation engine 6 when uni_mes enabled. It
is used in processing tlb flush request from host.

Signed-off-by: Michael Chen <michael.chen@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Shaoyun liu <Shaoyun.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 873373739b9b150720ea2c5390b4e904a4d21505)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 97b562a79ea8ee04c3b5321ef93117a311160a75..4814be022f32830f3c9257512ad4cdd979850460 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -597,6 +597,9 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev)
                /* reserve engine 5 for firmware */
                if (adev->enable_mes)
                        vm_inv_engs[i] &= ~(1 << 5);
+               /* reserve engine 6 for uni mes */
+               if (adev->enable_uni_mes)
+                       vm_inv_engs[i] &= ~(1 << 6);
                /* reserve mmhub engine 3 for firmware */
                if (adev->enable_umsch_mm)
                        vm_inv_engs[i] &= ~(1 << 3);