<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"></style> </head> <body dir="ltr"> <div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr"> <p style="margin-top:0;margin-bottom:0">Reviewed-by: Alex Deucher <alexander.deucher@amd.com><br> </p> <br> <br> <div style="color: rgb(0, 0, 0);"> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Rex Zhu <Rex.Zhu@amd.com><br> <b>Sent:</b> Thursday, August 9, 2018 3:31 AM<br> <b>To:</b> amd-gfx@lists.freedesktop.org<br> <b>Cc:</b> Zhu, Rex<br> <b>Subject:</b> [PATCH] drm/amdgpu: Cancel gfx off delay work when driver fini/suspend</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">there may be gfx off delay work pending when suspend/driver<br> unload, need to cancel them first.<br> <br> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com><br> ---<br> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++<br> 1 file changed, 2 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 1d933db..383f8eb 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br> @@ -1829,6 +1829,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)<br> return r;<br> }<br> amdgpu_gfx_off_ctrl(adev, false);<br> + cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);<br> r = adev->ip_blocks[i].version->funcs->hw_fini((void *)adev);<br> /* XXX handle errors */<br> if (r) {<br> @@ -2012,6 +2013,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)<br> <br> /* call smu to disable gfx off feature first when suspend */<br> amdgpu_gfx_off_ctrl(adev, false);<br> + cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);<br> <br> for (i = adev->num_ip_blocks - 1; i >= 0; i--) {<br> if (!adev->ip_blocks[i].status.valid)<br> -- <br> 1.9.1<br> <br> _______________________________________________<br> amd-gfx mailing list<br> amd-gfx@lists.freedesktop.org<br> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" id="LPlnk989219" class="OWAAutoLink" previewremoved="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a><br> </div> </span></font></div> </div> </div> </body> </html>