<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="blue" vlink="purple"> <div class="WordSection1"> <p class="MsoNormal">sure<o:p></o:p></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <p class="MsoNormal">_____________________________________<o:p></o:p></p> <p class="MsoNormal"><span style="font-size:12.0pt;color:black;background:white">Monk Liu|GPU Virtualization Team |</span><span style="font-size:12.0pt;color:#C82613;border:none windowtext 1.0pt;padding:0in;background:white">AMD<o:p></o:p></span></p> <p class="MsoNormal"><img width="80" height="80" style="width:.8333in;height:.8333in" id="Picture_x0020_1" src="cid:image001.png@01D55D92.9A07ABA0" alt="sig-cloud-gpu"><o:p></o:p></p> </div> <p class="MsoNormal"><o:p> </o:p></p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> <p class="MsoNormal"><b>From:</b> Deucher, Alexander <Alexander.Deucher@amd.com> <br> <b>Sent:</b> Tuesday, August 27, 2019 8:48 PM<br> <b>To:</b> Liu, Monk <Monk.Liu@amd.com>; amd-gfx@lists.freedesktop.org<br> <b>Subject:</b> Re: [PATCH] drm/amdgpu: introduce vram lost for reset<o:p></o:p></p> </div> </div> <p class="MsoNormal"><o:p> </o:p></p> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Can you update nv.c as well? With that fixed,<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Reviewed-by: Alex Deucher <<a href="mailto:alexander.deucher@amd.com">alexander.deucher@amd.com</a>><o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div class="MsoNormal" align="center" style="text-align:center"> <hr size="3" width="98%" align="center"> </div> <div id="divRplyFwdMsg"> <p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> amd-gfx <<a href="mailto:amd-gfx-bounces@lists.freedesktop.org">amd-gfx-bounces@lists.freedesktop.org</a>> on behalf of Monk Liu <<a href="mailto:Monk.Liu@amd.com">Monk.Liu@amd.com</a>><br> <b>Sent:</b> Tuesday, August 27, 2019 4:34 AM<br> <b>To:</b> <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <<a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a>><br> <b>Cc:</b> Liu, Monk <<a href="mailto:Monk.Liu@amd.com">Monk.Liu@amd.com</a>><br> <b>Subject:</b> [PATCH] drm/amdgpu: introduce vram lost for reset</span> <o:p></o:p></p> <div> <p class="MsoNormal"> <o:p></o:p></p> </div> </div> <div> <div> <p class="MsoNormal">for SOC15/vega10 the BACO reset & mode1 would introduce vram lost<br> in high end address range, current kmd's vram lost checking cannot<br> catch it since it only check very ahead visible frame buffer<br> <br> Signed-off-by: Monk Liu <<a href="mailto:Monk.Liu@amd.com">Monk.Liu@amd.com</a>><br> ---<br> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +<br> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++--<br> drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++<br> 3 files changed, 5 insertions(+), 2 deletions(-)<br> <br> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h<br> index f6ae565..11e0fc0 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h<br> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h<br> @@ -1155,6 +1155,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev);<br> #define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1)))<br> #define amdgpu_asic_need_reset_on_init(adev) (adev)->asic_funcs->need_reset_on_init((adev))<br> #define amdgpu_asic_get_pcie_replay_count(adev) ((adev)->asic_funcs->get_pcie_replay_count((adev)))<br> +#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));<br> <br> /* Common functions */<br> bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);<br> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br> index 02b3e7d..31690e9 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c<br> @@ -3482,7 +3482,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,<br> amdgpu_virt_init_data_exchange(adev);<br> amdgpu_virt_release_full_gpu(adev, true);<br> if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {<br> - atomic_inc(&adev->vram_lost_counter);<br> + amdgpu_inc_vram_lost(adev);<br> r = amdgpu_device_recover_vram(adev);<br> }<br> <br> @@ -3648,7 +3648,7 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive,<br> vram_lost = amdgpu_device_check_vram_lost(tmp_adev);<br> if (vram_lost) {<br> DRM_INFO("VRAM is lost due to GPU reset!\n");<br> - atomic_inc(&tmp_adev->vram_lost_counter);<br> + amdgpu_inc_vram_lost(tmp_adev);<br> }<br> <br> r = amdgpu_gtt_mgr_recover(<br> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c<br> index fe2212df..8af7501 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c<br> @@ -557,10 +557,12 @@ static int soc15_asic_reset(struct amdgpu_device *adev)<br> {<br> switch (soc15_asic_reset_method(adev)) {<br> case AMD_RESET_METHOD_BACO:<br> + amdgpu_inc_vram_lost(adev);<br> return soc15_asic_baco_reset(adev);<br> case AMD_RESET_METHOD_MODE2:<br> return soc15_mode2_reset(adev);<br> default:<br> + amdgpu_inc_vram_lost(adev);<br> return soc15_asic_mode1_reset(adev);<br> }<br> }<br> -- <br> 2.7.4<br> <br> _______________________________________________<br> amd-gfx mailing list<br> <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a><o:p></o:p></p> </div> </div> </div> </body> </html>