On Tue, Feb 23, 2021 at 1:00 PM Liu, Shaoyun <Shaoyun.Liu@xxxxxxx> wrote: > > [AMD Official Use Only - Internal Distribution Only] > > Thanks , Alex. > Whole four patches are needed for the XGMI reset to work normally . I try to describe what these patches for in the first patch. But If you don't mind this , I can adjust the order as suggested . Just update the commit messages to indicate that these changes are needed for big rework in the later patches. Alex > > Thanks > Shaoyun.liu > > -----Original Message----- > From: Alex Deucher <alexdeucher@xxxxxxxxx> > Sent: Tuesday, February 23, 2021 11:26 AM > To: Liu, Shaoyun <Shaoyun.Liu@xxxxxxx> > Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx> > Subject: Re: [PATCH 2/4] drm/amdgpu: get xgmi info at eary_init > > On Thu, Feb 18, 2021 at 8:19 PM shaoyunl <shaoyun.liu@xxxxxxx> wrote: > > > > Driver need to get XGMI info function earlier before ip_init since > > driver need to check the XGMI setting to determine how to perform > > reset during init > > > > Signed-off-by: shaoyunl <shaoyun.liu@xxxxxxx> > > Change-Id: Ic37276bbb6640bb4e9360220fed99494cedd3ef5 > > I think this patch needs to come first or patch 1 won't work. With that changed, this patch is: > Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > > > --- > > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 ++++------ > > 1 file changed, 4 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > > b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > > index 3686e777c76c..3e6bfab5b855 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > > @@ -1151,6 +1151,10 @@ static int gmc_v9_0_early_init(void *handle) > > adev->gmc.private_aperture_end = > > adev->gmc.private_aperture_start + (4ULL << 30) - 1; > > > > + /* Need to get xgmi info earlier to decide the reset behavior*/ > > + if (adev->gmc.xgmi.supported) > > + adev->gfxhub.funcs->get_xgmi_info(adev); > > + > > return 0; > > } > > > > @@ -1416,12 +1420,6 @@ static int gmc_v9_0_sw_init(void *handle) > > } > > adev->need_swiotlb = drm_need_swiotlb(44); > > > > - if (adev->gmc.xgmi.supported) { > > - r = adev->gfxhub.funcs->get_xgmi_info(adev); > > - if (r) > > - return r; > > - } > > - > > r = gmc_v9_0_mc_init(adev); > > if (r) > > return r; > > -- > > 2.17.1 > > > > _______________________________________________ > > amd-gfx mailing list > > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist > > s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Csh > > aoyun.liu%40amd.com%7Ceb081cfaf9c94e59521008d8d817ccee%7C3dd8961fe4884 > > e608e11a82d994e183d%7C0%7C0%7C637496944032343059%7CUnknown%7CTWFpbGZsb > > 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% > > 7C1000&sdata=CrS5Nv4uCh8sFRILLGM%2FRgxpVlEEs%2Bft%2FHTdoeQyyqo%3D& > > amp;reserved=0 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx