<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);">
Is this ok for navi1x gfxoff?<br>
</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);">
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> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of James Zhu <James.Zhu@amd.com><br>
<b>Sent:</b> Thursday, April 16, 2020 12:24 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Zhu, James <James.Zhu@amd.com>; Zhu, Changfeng <Changfeng.Zhu@amd.com><br>
<b>Subject:</b> [PATCH] Revert "drm/amdgpu: Disable gfx off if VCN is busy"</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">This reverts commit 3fded222f4bf7f4c56ef4854872a39a4de08f7a8<br>
This is work around for vcn1 only. Currently vcn1 has separate<br>
begin_use and idle work handle.<br>
<br>
Signed-off-by: James Zhu <James.Zhu@amd.com><br>
Tested-by: changzhu <Changfeng.Zhu@amd.com><br>
---<br>
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 --<br>
 1 file changed, 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c<br>
index dab34f6..2de99b4 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c<br>
@@ -353,7 +353,6 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)<br>
         }<br>
 <br>
         if (!fences && !atomic_read(&adev->vcn.total_submission_cnt)) {<br>
-               amdgpu_gfx_off_ctrl(adev, true);<br>
                 amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,<br>
                        AMD_PG_STATE_GATE);<br>
         } else {<br>
@@ -369,7 +368,6 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)<br>
         cancel_delayed_work_sync(&adev->vcn.idle_work);<br>
 <br>
         mutex_lock(&adev->vcn.vcn_pg_lock);<br>
-       amdgpu_gfx_off_ctrl(adev, false);<br>
         amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,<br>
                AMD_PG_STATE_UNGATE);<br>
 <br>
-- <br>
2.7.4<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&amp;data=02%7C01%7Calexander.deucher%40amd.com%7C99bd3d804c734285dd8808d7e222baac%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637226511714024768&amp;sdata=GfKFgfaeHLzyDZk00CvV8SvLum3KC4xzYUsBxNVeabI%3D&amp;reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7C99bd3d804c734285dd8808d7e222baac%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637226511714024768&amp;sdata=GfKFgfaeHLzyDZk00CvV8SvLum3KC4xzYUsBxNVeabI%3D&amp;reserved=0</a><br>
</div>
</span></font></div>
</div>
</body>
</html>