Merge tag 'drm-misc-next-2023-01-03' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gmc.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 3169a942dbbbddb8a8e8135d889926727705ee90..12871b71b07b38a8f59178b2cd8b50e72544e12f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -480,6 +480,12 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev)
        unsigned i;
        unsigned vmhub, inv_eng;
 
+       if (adev->enable_mes) {
+               /* reserve engine 5 for firmware */
+               for (vmhub = 0; vmhub < AMDGPU_MAX_VMHUBS; vmhub++)
+                       vm_inv_engs[vmhub] &= ~(1 << 5);
+       }
+
        for (i = 0; i < adev->num_rings; ++i) {
                ring = adev->rings[i];
                vmhub = ring->funcs->vmhub;
@@ -544,6 +550,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
        /* YELLOW_CARP*/
        case IP_VERSION(10, 3, 3):
        case IP_VERSION(11, 0, 1):
+       case IP_VERSION(11, 0, 4):
                /* Don't enable it by default yet.
                 */
                if (amdgpu_tmz < 1) {