[PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Deucher, Alexander]

[AMD Public Use]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of
> Deucher, Alexander
> Sent: Monday, March 15, 2021 3:24 PM
> To: Das, Nirmoy <Nirmoy.Das at amd.com>; Zeng, Oak
> <Oak.Zeng at amd.com>; amd-gfx at lists.freedesktop.org
> Subject: RE: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390
> 
> [AMD Public Use]
> 
> > -----Original Message-----
> > From: Das, Nirmoy <Nirmoy.Das at amd.com>
> > Sent: Monday, March 15, 2021 3:17 PM
> > To: Deucher, Alexander <Alexander.Deucher at amd.com>; Das, Nirmoy
> > <Nirmoy.Das at amd.com>; Zeng, Oak <Oak.Zeng at amd.com>; amd-
> > gfx at lists.freedesktop.org
> > Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture
> > s390
> >
> > Hi Alex,
> >
> > On 3/15/21 7:46 PM, Deucher, Alexander wrote:
> > > [AMD Public Use]
> > >
> > >> -----Original Message-----
> > >> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of
> > >> Nirmoy
> > >> Sent: Monday, March 15, 2021 2:43 PM
> > >> To: Zeng, Oak <Oak.Zeng at amd.com>; amd-gfx at lists.freedesktop.org
> > >> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on
> > >> architecture s390
> > >>
> > >> Wouldn't this restrict amdgpu for only x86 platform?
> > > This particular case will only be x86.
> >
> >
> > If I understand correctly, we map all the VRAM at startup to avoid
> >
> > mapping each BOs. Can't we do that for other Archs ?
> 
> You are right.  The else should be CONFIG_64BIT not CONFIG_X86.  @Zeng,
> Oak can you fix this up?

Just sent out the fix.

Alex

> 
> Alex
> 
> 
> >
> >
> > Nirmoy
> >
> >
> > >
> > > Alex
> > >
> > >> On 3/11/21 4:29 AM, Oak Zeng wrote:
> > >>> ioremap_cache is not supported on some architecture such as s390.
> > >>> Put the codes into a #ifdef to fix some compile error reported by
> > >>> test robot.
> > >>>
> > >>> Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>
> > >>> Reported-by: Kernel test robot <lkp at intel.com>
> > >>> ---
> > >>>    drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> > >>>    1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>
> > >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> index 37751e7..1091585 100644
> > >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> @@ -1817,7 +1817,7 @@ int amdgpu_ttm_init(struct amdgpu_device
> > >> *adev)
> > >>>    	/* Change the size here instead of the init above so only lpfn
> > >>> is
> > >> affected */
> > >>>    	amdgpu_ttm_set_buffer_funcs_status(adev, false); -#ifdef
> > >>> CONFIG_64BIT
> > >>> +#ifdef CONFIG_X86
> > >>>    	if (adev->gmc.xgmi.connected_to_cpu)
> > >>>    		adev->mman.aper_base_kaddr =
> ioremap_cache(adev-
> > gmc.aper_base,
> > >>>    				adev->gmc.visible_vram_size);
> > >> _______________________________________________
> > >> amd-gfx mailing list
> > >> amd-gfx at lists.freedesktop.org
> > >>
> >
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.
> > >> freedesktop.org%2Fmailman%2Flistinfo%2Famd-
> > >>
> >
> gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C6fab18a743
> > >>
> >
> c84b8abbd008d8e7e21e10%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> > >>
> >
> C0%7C637514305648085244%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> > >>
> >
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> > >>
> >
> p;sdata=KLYRSc45rllptRvyiOF18qA9IFt5zAGXL1zsHasgdLs%3D&reserved
> > >> =0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.
> freedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&data=04%7C01%7Calexander.deucher%40amd.com%7Cb8ba85a6c5
> 2449ad7ea908d8e7e7f43e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637514330707623225%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=k0wrS%2BIRR7D%2B7%2FA4S%2B%2F3Hcrb6VWJueVibaFaKlStNic%3
> D&reserved=0