<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);">
This seems kind of complicated and error prone. I didn't realize the extent to the changes required. I think it would be better to either add arcturus specific versions of these functions or just go with your original approach and add a new arcturus_ih.c.
If you go with the second route however, no need to show all your intermediate steps, just add the new files in one commit.</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> Thursday, March 19, 2020 8:22 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 1/4] drm/amdgpu: add stride to calculate oss ring offsets</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Arcturus and vega10 share the same vega10_ih, however both<br>
have different register offsets at the ih ring section.<br>
This variable is used to help calculate ih ring register addresses<br>
from the osssys, that corresponds to the current asic type.<br>
<br>
Signed-off-by: Alex Sierra <alex.sierra@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++++<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +<br>
2 files changed, 5 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c<br>
index 5ed4227f304b..fa384ae9a9bc 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c<br>
@@ -279,6 +279,10 @@ int amdgpu_irq_init(struct amdgpu_device *adev)<br>
amdgpu_hotplug_work_func);<br>
}<br>
<br>
+ if (adev->asic_type == CHIP_ARCTURUS)<br>
+ adev->irq.ring_stride = 1;<br>
+ else<br>
+ adev->irq.ring_stride = 0;<br>
INIT_WORK(&adev->irq.ih1_work, amdgpu_irq_handle_ih1);<br>
INIT_WORK(&adev->irq.ih2_work, amdgpu_irq_handle_ih2);<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h<br>
index c718e94a55c9..1ec5b735cd9e 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h<br>
@@ -97,6 +97,7 @@ struct amdgpu_irq {<br>
struct irq_domain *domain; /* GPU irq controller domain */<br>
unsigned virq[AMDGPU_MAX_IRQ_SRC_ID];<br>
uint32_t srbm_soft_reset;<br>
+ unsigned ring_stride;<br>
};<br>
<br>
void amdgpu_irq_disable_all(struct amdgpu_device *adev);<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=02%7C01%7Calexander.deucher%40amd.com%7C17d5391c86ff4ceee12b08d7cc64f056%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637202606831789803&sdata=B%2BbtLEKN5A65OEp8se5m1M4aQGX7kxsqYYGTTukF5m8%3D&reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C17d5391c86ff4ceee12b08d7cc64f056%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637202606831789803&sdata=B%2BbtLEKN5A65OEp8se5m1M4aQGX7kxsqYYGTTukF5m8%3D&reserved=0</a><br>
</div>
</span></font></div>
</div>
</body>
</html>