From: Jack Xiao <Jack.Xiao@amd.com>
Date: Tue, 24 Mar 2020 20:28:43 +0000 (-0400)
Subject: drm/amdgpu: add mes block to sienna_cichlid
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a346ef86a97f8e1257893999c809ddd18754499b;p=linux.git

drm/amdgpu: add mes block to sienna_cichlid

Add mes block support to sienna_cichlid.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@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/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index cad66cb1b6c2d..587d0b6821f8a 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -497,6 +497,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
 			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
 		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);
 		amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block);
+		if (adev->enable_mes)
+			amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block);
 		break;
 	default:
 		return -EINVAL;