<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">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Nice clean up. 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> Hawking Zhang <Hawking.Zhang@amd.com><br>
<b>Sent:</b> Wednesday, August 28, 2019 9:03 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Zhou1, Tao <Tao.Zhou1@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com><br>
<b>Cc:</b> Zhang, Hawking <Hawking.Zhang@amd.com><br>
<b>Subject:</b> [PATCH 7/7] drm/amdgpu: switch to ras_late_init callback for nbio v7_4</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">invoke nbio ras_late_init callback function to do nbio ras init<br>
<br>
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/soc15.c | 13 ++++++++++++-<br>
1 file changed, 12 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
index e7f2539..f53bd59 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c<br>
@@ -1206,11 +1206,15 @@ static int soc15_common_early_init(void *handle)<br>
static int soc15_common_late_init(void *handle)<br>
{<br>
struct amdgpu_device *adev = (struct amdgpu_device *)handle;<br>
+ int r;<br>
<br>
if (amdgpu_sriov_vf(adev))<br>
xgpu_ai_mailbox_get_irq(adev);<br>
<br>
- return 0;<br>
+ if (adev->nbio.funcs->ras_late_init)<br>
+ r = adev->nbio.funcs->ras_late_init(adev);<br>
+<br>
+ return r;<br>
}<br>
<br>
static int soc15_common_sw_init(void *handle)<br>
@@ -1287,6 +1291,13 @@ static int soc15_common_hw_fini(void *handle)<br>
if (amdgpu_sriov_vf(adev))<br>
xgpu_ai_mailbox_put_irq(adev);<br>
<br>
+ if (amdgpu_ras_is_supported(adev, adev->nbio.ras_if->block)) {<br>
+ if (adev->nbio.funcs->init_ras_controller_interrupt)<br>
+ amdgpu_irq_put(adev, &adev->nbio.ras_controller_irq, 0);<br>
+ if (adev->nbio.funcs->init_ras_err_event_athub_interrupt)<br>
+ amdgpu_irq_put(adev, &adev->nbio.ras_err_event_athub_irq, 0);<br>
+ }<br>
+<br>
return 0;<br>
}<br>
<br>
-- <br>
2.7.4<br>
<br>
</div>
</span></font></div>
</body>
</html>