Hi Bokun, please remove the change-id in your commit message when submitting this patch. Acked-by: Jingwen Chen <Jingwen.Chen2@xxxxxxx> On 2021/11/27 上午8:57, Bokun Zhang wrote: > From: Bokun Zhang <bokun.zhang@xxxxxxx> > > In the patch about advanced TDR mode, we force to always set > amdgpu_gpu_recovery=2 under SRIOV. This is not ideal, since we > may want to revert back to use the legacy TDR routine. > > Therefore, we only set amdgpu_gpu_recovery=2 when it is > configured as AUTO, which is the default value (gpu_recovery=-1) > > Signed-off-by: Bokun Zhang <bokun.zhang@xxxxxxx> > Change-Id: Ifae78854b53f124d2ea53f401919ab5e403ef822 > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > index 93af2cd2a065..62ec484a35aa 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c > @@ -64,8 +64,8 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev) > adev->cg_flags = 0; > adev->pg_flags = 0; > > - /*use advance recovery mode for SRIOV*/ > - if (amdgpu_gpu_recovery) > + /* use advance recovery mode for SRIOV by default */ > + if (amdgpu_gpu_recovery == -1) > amdgpu_gpu_recovery = 2; > } >
