<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:10pt;color:#0078D7;margin:15pt;" align="Left">
[AMD Official Use Only - Internal Distribution Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Series is:</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Alex Deucher <alexander.deucher@amd.com><br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Huang, Ray <Ray.Huang@amd.com><br>
<b>Sent:</b> Thursday, October 15, 2020 4:28 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Wentland, Harry <Harry.Wentland@amd.com>; Li, Roman <Roman.Li@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Huang, Ray <Ray.Huang@amd.com><br>
<b>Subject:</b> [PATCH 2/2] drm/amdgpu/display: enable display ip block for vangogh</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">This patch is to enable display IP block for vangogh platforms.<br>
<br>
Signed-off-by: Huang Rui <ray.huang@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +<br>
drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++++<br>
2 files changed, 5 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br>
index a2f0ce854160..15ffb47bd1f0 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br>
@@ -3014,6 +3014,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)<br>
case CHIP_SIENNA_CICHLID:<br>
case CHIP_NAVY_FLOUNDER:<br>
case CHIP_DIMGREY_CAVEFISH:<br>
+ case CHIP_VANGOGH:<br>
#endif<br>
return amdgpu_dc != 0;<br>
#endif<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c<br>
index 47bd79c9e6ea..217533e2f181 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/nv.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c<br>
@@ -621,6 +621,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)<br>
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);<br>
if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))<br>
amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);<br>
+#if defined(CONFIG_DRM_AMD_DC)<br>
+ else if (amdgpu_device_has_dc_support(adev))<br>
+ amdgpu_device_ip_block_add(adev, &dm_ip_block);<br>
+#endif<br>
amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);<br>
amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block);<br>
amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>