From: Boyuan Zhang <boyuan.zhang@amd.com>
Date: Thu, 18 Jul 2019 14:13:23 +0000 (-0400)
Subject: drm/amdgpu: add VCN ip block for Navi12
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1fbed280a2445aba3700eae72b31a623311b2c2e;p=openwrt%2Fstaging%2Fblogic.git

drm/amdgpu: add VCN ip block for Navi12

Add VCN2 ip block for Navi12

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Leo Liu <leo.liu@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 9bbc4bb3d1b3..b97d48608ccc 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -437,6 +437,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
 		if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&
 		    is_support_sw_smu(adev))
 			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
+		amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);
 		break;
 	default:
 		return -EINVAL;