I don't think we should push any emulation specific code upstream. Nobody outside of AMD can test anything of that not actually make any use of it. Regards, Christian. Am 01.02.2018 um 21:15 schrieb Shaoyun Liu: > During emulation period, use the directly load for firmware also > only enable the GFX , SDMA and necessary common, gmc, ih IP block > > Signed-off-by: Shaoyun Liu <Shaoyun.Liu at amd.com> > > Change-Id: I325910fa06be4060725f404e471cc79daaf343c3 > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 5a5ed47..7a1c670 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -93,10 +93,18 @@ > int amdgpu_msi = -1; > int amdgpu_lockup_timeout = 10000; > int amdgpu_dpm = -1; > -int amdgpu_fw_load_type = -1; > int amdgpu_aspm = -1; > int amdgpu_runtime_pm = -1; > +#ifndef AMDGPU_EMULATOR_BUILD > uint amdgpu_ip_block_mask = 0xffffffff; > +int amdgpu_fw_load_type = -1; > +#else > +/* Only enable GFX and SDMA + common, gmc, ih IP block for emulation */ > +uint amdgpu_ip_block_mask = 0xc7; > +/* Normally, only direct load is support durign emulation time */ > +int amdgpu_fw_load_type = 0; > +#endif > + > int amdgpu_bapm = -1; > int amdgpu_deep_color = 0; > int amdgpu_vm_size = -1;
