<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:#317100;margin:15pt;" align="Left">
[AMD Public Use]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
It might be cleaner to just split out vega20 into a separate switch case in that function.</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Alex</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<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> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Sierra <alex.sierra@amd.com><br>
<b>Sent:</b> Friday, October 30, 2020 11:06 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Sierra Guiza, Alejandro (Alex) <Alex.Sierra@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: replace ih ip block for vega20 and arcturus</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">[Why]<br>
Vega20 and Arcturus asics use oss 5.0 version.<br>
<br>
[How]<br>
Replace ih ip block by navi10 for vega20 and arcturus.<br>
<br>
Signed-off-by: Alex Sierra <alex.sierra@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +++++++++++----<br>
1 file changed, 11 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
index f57c5f57efa8..fc5b11752931 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
@@ -62,6 +62,7 @@<br>
#include "nbio_v7_0.h"<br>
#include "nbio_v7_4.h"<br>
#include "vega10_ih.h"<br>
+#include "navi10_ih.h"<br>
#include "sdma_v4_0.h"<br>
#include "uvd_v7_0.h"<br>
#include "vce_v4_0.h"<br>
@@ -734,9 +735,15 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)<br>
else<br>
amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);<br>
}<br>
- amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
+ if (adev->asic_type == CHIP_VEGA20)<br>
+ amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);<br>
+ else<br>
+ amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
} else {<br>
- amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
+ if (adev->asic_type == CHIP_VEGA20)<br>
+ amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);<br>
+ else<br>
+ amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {<br>
if (adev->asic_type == CHIP_VEGA20)<br>
amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);<br>
@@ -787,9 +794,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)<br>
if (amdgpu_sriov_vf(adev)) {<br>
if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))<br>
amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);<br>
- amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
+ amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);<br>
} else {<br>
- amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);<br>
+ amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);<br>
if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))<br>
amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);<br>
}<br>
-- <br>
2.17.1<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C1f54f989cd9641c49c9708d87d4a000e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637397104709391689%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=fe%2FU57bvUywZ57162F0sTzo%2FDaYGtX62J0MJf36Nxfo%3D&reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C1f54f989cd9641c49c9708d87d4a000e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637397104709391689%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=fe%2FU57bvUywZ57162F0sTzo%2FDaYGtX62J0MJf36Nxfo%3D&reserved=0</a><br>
</div>
</span></font></div>
</div>
</body>
</html>