[PATCH] drm/amdgpu: Add place holder for soc15 asic init on emulation

Deucher, Alexander Alexander.Deucher at amd.com
Tue Feb 6 22:46:33 UTC 2018 

> -----Original Message-----
> From: Liu, Shaoyun
> Sent: Tuesday, February 6, 2018 5:42 PM
> To: Deucher, Alexander <Alexander.Deucher at amd.com>
> Cc: amd-gfx list <amd-gfx at lists.freedesktop.org>; Bridgman, John
> <John.Bridgman at amd.com>
> Subject: RE: [PATCH] drm/amdgpu: Add place holder for soc15 asic init on
> emulation
> 
> Thanks . Can  I add Review-By you for this patch  ?
> 

I'd prefer to adjust the logic as per my suggestion below to make things more consistent between silicon and emulation, but if you want to make those changes as a follow-on patch, I'm ok with that.  Please add a better commit message.  With that:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>


> Shaoyun.liu
> 
> -----Original Message-----
> From: Deucher, Alexander
> Sent: Tuesday, February 06, 2018 5:37 PM
> To: Liu, Shaoyun; Alex Deucher
> Cc: amd-gfx list; Bridgman, John
> Subject: RE: [PATCH] drm/amdgpu: Add place holder for soc15 asic init on
> emulation
> 
> > -----Original Message-----
> > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> > Of Liu, Shaoyun
> > Sent: Tuesday, February 6, 2018 5:26 PM
> > To: Alex Deucher <alexdeucher at gmail.com>
> > Cc: amd-gfx list <amd-gfx at lists.freedesktop.org>; Bridgman, John
> > <John.Bridgman at amd.com>
> > Subject: RE: [PATCH] drm/amdgpu: Add place holder for soc15 asic init
> > on emulation
> >
> > You are right , I try to use the  emu_soc_asic_init()as a entry point
> > for any family .
> > For driver to get into amdgpu_atom_asic_init() function call , it
> > depends on other logic like read bios and check some  register etc .
> > On emulation mode , we can not get bios image so it will requires more
> > code and logic change based on existing  code  than we use the common
> > hw init  entry point  to simulate the  post .  In either way ,do you
> > agree to keep a separate file as emu_soc.c for this init sequence on
> emulation mdoe?
> 
> You already sent out a patch to skip all of the vbios fetching and asic init stuff
> if emu ==1, It would be a trivial patch on top of that one to just call the
> emu_soc code when emu == 1 in amdgpu_device_init().  I'm fine with the
> separate file.  You've convinced me.
> 
> Alex
> 
> 
> >
> > Shaoyun.liu
> >
> >
> > -----Original Message-----
> > From: Alex Deucher [mailto:alexdeucher at gmail.com]
> > Sent: Tuesday, February 06, 2018 5:03 PM
> > To: Liu, Shaoyun
> > Cc: Bridgman, John; amd-gfx list
> > Subject: Re: [PATCH] drm/amdgpu: Add place holder for soc15 asic init
> > on emulation
> >
> > On Tue, Feb 6, 2018 at 4:55 PM, Liu, Shaoyun <Shaoyun.Liu at amd.com>
> > wrote:
> > > Ye, I  try to put  the asic specific  register sequences for
> > > emulation in a
> > separate emu_soc.c file, I think it's suggested by John or you ?  The
> > asic specific code will  be  keep in separate bring up branch , but a
> > common place to add them  seems  not bad to me .
> > >
> > > Shaoyun.liu
> >
> > I guess the idea is that you could use emu_soc_asic_init() for any
> > family, that makes sense.  To keep the logic more similar to actual
> > silicon, it might be better to make emu_soc_asic_init() a replacement
> > for atom_asic_init() in amdgpu_device.c.  E.g.,
> >
> > if (emu == 1) {
> >     emu_soc_asic_init();
> > } else {
> >     // do vbios stuff
> > }
> >
> > Then we can drop the other changes to the ip ordering for emulation.
> >
> > Alex
> >
> > >
> > > -----Original Message-----
> > > From: Alex Deucher [mailto:alexdeucher at gmail.com]
> > > Sent: Tuesday, February 06, 2018 4:46 PM
> > > To: Liu, Shaoyun
> > > Cc: amd-gfx list
> > > Subject: Re: [PATCH] drm/amdgpu: Add place holder for soc15 asic
> > > init on emulation
> > >
> > > On Tue, Feb 6, 2018 at 4:41 PM, Shaoyun Liu <Shaoyun.Liu at amd.com>
> > wrote:
> > >> Change-Id: I6ff04e1199d1ebdbdb31d0e7e8ca3c240c61ab3a
> > >> Signed-off-by: Shaoyun Liu <Shaoyun.Liu at amd.com>
> > >
> > > What is the purpose of this?  If it's just as a hint the the driver
> > > writer as to
> > where to add the emulation register sequences from the IP teams, I
> > don't see much value in it.  Just add a comment.
> > >
> > > Alex
> > >
> > >
> > >> ---
> > >>  drivers/gpu/drm/amd/amdgpu/Makefile  |  2 +-
> > >> drivers/gpu/drm/amd/amdgpu/amdgpu.h  |  2 ++
> > >> drivers/gpu/drm/amd/amdgpu/emu_soc.c | 33
> > +++++++++++++++++++++++++++++++++
> > >>  drivers/gpu/drm/amd/amdgpu/soc15.c   |  4 ++++
> > >>  4 files changed, 40 insertions(+), 1 deletion(-)  create mode
> > >> 100644 drivers/gpu/drm/amd/amdgpu/emu_soc.c
> > >>
> > >> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
> > >> b/drivers/gpu/drm/amd/amdgpu/Makefile
> > >> index 1f6d43e..6f5db5e 100644
> > >> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> > >> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> > >> @@ -41,7 +41,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o
> > cik_ih.o
> > >> kv_smc.o kv_dpm.o \  amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o
> > gmc_v6_0.o
> > >> gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o
> > >>
> > >>  amdgpu-y += \
> > >> -       vi.o mxgpu_vi.o nbio_v6_1.o soc15.o mxgpu_ai.o nbio_v7_0.o
> > vega10_reg_init.o vega20_reg_init.o nbio_v7_4.o
> > >> +       vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o
> > >> + nbio_v7_0.o vega10_reg_init.o vega20_reg_init.o nbio_v7_4.o
> > >>
> > >>  # add GMC block
> > >>  amdgpu-y += \
> > >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > >> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > >> index d417cfb..13aa8a8 100644
> > >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > >> @@ -1740,6 +1740,8 @@ void amdgpu_mm_wreg(struct
> amdgpu_device
> > *adev,
> > >> uint32_t reg, uint32_t v,  bool
> > >> amdgpu_device_asic_has_dc_support(enum
> > >> amd_asic_type asic_type);  bool
> amdgpu_device_has_dc_support(struct
> > >> amdgpu_device *adev);
> > >>
> > >> +int emu_soc_asic_init(struct amdgpu_device *adev);
> > >> +
> > >>  /*
> > >>   * Registers read & write functions.
> > >>   */
> > >> diff --git a/drivers/gpu/drm/amd/amdgpu/emu_soc.c
> > >> b/drivers/gpu/drm/amd/amdgpu/emu_soc.c
> > >> new file mode 100644
> > >> index 0000000..d72c25c
> > >> --- /dev/null
> > >> +++ b/drivers/gpu/drm/amd/amdgpu/emu_soc.c
> > >> @@ -0,0 +1,33 @@
> > >> +/*
> > >> + * Copyright 2018 Advanced Micro Devices, Inc.
> > >> + *
> > >> + * Permission is hereby granted, free of charge, to any person
> > >> +obtaining a
> > >> + * copy of this software and associated documentation files (the
> > >> +"Software"),
> > >> + * to deal in the Software without restriction, including without
> > >> +limitation
> > >> + * the rights to use, copy, modify, merge, publish, distribute,
> > >> +sublicense,
> > >> + * and/or sell copies of the Software, and to permit persons to
> > >> +whom the
> > >> + * Software is furnished to do so, subject to the following conditions:
> > >> + *
> > >> + * The above copyright notice and this permission notice shall be
> > >> +included in
> > >> + * all copies or substantial portions of the Software.
> > >> + *
> > >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
> > KIND,
> > >> +EXPRESS OR
> > >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > >> +MERCHANTABILITY,
> > >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN
> > NO
> > >> +EVENT SHALL
> > >> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY
> CLAIM,
> > >> +DAMAGES OR
> > >> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> > >> +OTHERWISE,
> > >> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
> OR
> > THE
> > >> +USE OR
> > >> + * OTHER DEALINGS IN THE SOFTWARE.
> > >> + *
> > >> + */
> > >> +#include "amdgpu.h"
> > >> +#include "soc15.h"
> > >> +
> > >> +#include "soc15_common.h"
> > >> +#include "soc15_hw_ip.h"
> > >> +
> > >> +int emu_soc_asic_init(struct amdgpu_device *adev) {
> > >> +       return 0;
> > >> +}
> > >> +
> > >> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
> > >> b/drivers/gpu/drm/amd/amdgpu/soc15.c
> > >> index 22cd84f..6a3d108 100644
> > >> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> > >> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> > >> @@ -747,6 +747,10 @@ static int soc15_common_hw_init(void
> *handle)
> > {
> > >>         struct amdgpu_device *adev = (struct amdgpu_device
> > >> *)handle;
> > >>
> > >> +       /* Add asic specific init sequence for emulation */
> > >> +       if (amdgpu_emu_mode == 1)
> > >> +               emu_soc_asic_init(adev);
> > >> +
> > >>         /* enable pcie gen2/3 link */
> > >>         soc15_pcie_gen3_enable(adev);
> > >>         /* enable aspm */
> > >> --
> > >> 1.9.1
> > >>
> > >> _______________________________________________
> > >> amd-gfx mailing list
> > >> amd-gfx at lists.freedesktop.org
> > >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx

More information about the amd-gfx mailing list