drm/amdgpu/discovery: add mes v12_0 ip block

Add mes v12_0 ip block.

v2: squash in update (Alex)
v3: rebase on unified mes changes (Alex)

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index c3d9424521644bbf9fffde65d0a3e401e30cfcdc..824dd5b57d0d397db46e514da58c8d802aa9b19f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -96,6 +96,7 @@
 #include "amdgpu_vkms.h"
 #include "mes_v10_1.h"
 #include "mes_v11_0.h"
+#include "mes_v12_0.h"
 #include "smuio_v11_0.h"
 #include "smuio_v11_0_6.h"
 #include "smuio_v13_0.h"
@@ -2246,6 +2247,14 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)
                if (amdgpu_uni_mes)
                        adev->enable_uni_mes = true;
                break;
+       case IP_VERSION(12, 0, 0):
+       case IP_VERSION(12, 0, 1):
+               amdgpu_device_ip_block_add(adev, &mes_v12_0_ip_block);
+               adev->enable_mes = true;
+               adev->enable_mes_kiq = true;
+               if (amdgpu_uni_mes)
+                       adev->enable_uni_mes = true;
+               break;
        default:
                break;
        }