|
[AMD Official Use Only - Internal Distribution Only]
Hi Alex,
Sorry, I misunderstand your meaning, I will refine it.
Thanks!
Rico
From: Alex Deucher <alexdeucher@xxxxxxxxx>
Sent: Thursday, October 22, 2020 11:16 To: Yin, Tianci (Rico) <Tianci.Yin@xxxxxxx> Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Long, Gang <Gang.Long@xxxxxxx>; Chen, Guchun <Guchun.Chen@xxxxxxx>; Xu, Feifei <Feifei.Xu@xxxxxxx>; Tuikov, Luben <Luben.Tuikov@xxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Cui, Flora <Flora.Cui@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx> Subject: Re: [PATCH 2/3] drm/amdgpu: disable DCN for navi10 blockchain SKU On Wed, Oct 21, 2020 at 11:04 PM Tianci Yin <tianci.yin@xxxxxxx> wrote:
> > From: "Tianci.Yin" <tianci.yin@xxxxxxx> > > The blockchain SKU has no display support, remove it. > > Change-Id: Ia83bef1499708dfd0113fe2dbb3eb4143452c1cd > Reviewed-by: Guchun Chen <guchun.chen@xxxxxxx> > Signed-off-by: Tianci.Yin <tianci.yin@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +++++++++++++++++++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- > 4 files changed, 30 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index f8f3e375c93e..3c63fb8904de 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1051,7 +1051,8 @@ void amdgpu_device_indirect_wreg64(struct amdgpu_device *adev, > u32 pcie_index, u32 pcie_data, > u32 reg_addr, u64 reg_data); > > -bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type); > +bool amdgpu_device_asic_is_blockchain_sku(struct pci_dev *pdev); > +bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type, struct pci_dev *pdev); > bool amdgpu_device_has_dc_support(struct amdgpu_device *adev); > > int emu_soc_asic_init(struct amdgpu_device *adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index c567f20b9d1f..5dd05e72ed9e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2954,15 +2954,32 @@ static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev) > } > } > > +/** > + * amdgpu_device_asic_is_blockchain_sku - determine if the asic is blockchain > + * SKU > + * > + * @pdev: pointer to pci_dev instance > + * > + * returns true if the asic is blockchain SKU, false if not. > + */ > +bool amdgpu_device_asic_is_blockchain_sku(struct pci_dev *pdev) > +{ > + if (pdev->device == 0x731E && > + (pdev->revision == 0xC6 || pdev->revision == 0xC7)) > + return true; > + return false; > +} I don't think this makes sense to have a navi specific function in amdgpu_device.c. Also, I said said previously, wouldn't it be easier to just check in nv.c? E.g., diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 1ce741a0c6a7..e661e796fb4c 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -483,8 +483,12 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); #if defined(CONFIG_DRM_AMD_DC) - else if (amdgpu_device_has_dc_support(adev)) - amdgpu_device_ip_block_add(adev, &dm_ip_block); + else if (amdgpu_device_has_dc_support(adev)) { + if (adev->pdev->device != 0x731E || + (adev->pdev->revision != 0xC6 && + adev->pdev->revision != 0xC7)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); + } #endif amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block); > + > /** > * amdgpu_device_asic_has_dc_support - determine if DC supports the asic > * > * @asic_type: AMD asic type > + * @pdev: pointer to pci_dev instance > * > * Check if there is DC (new modesetting infrastructre) support for an asic. > * returns true if DC has support, false if not. > */ > -bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) > +bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type, struct pci_dev *pdev) > { > switch (asic_type) { > #if defined(CONFIG_DRM_AMD_DC) > @@ -2999,6 +3016,13 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) > #if defined(CONFIG_DRM_AMD_DC_DCN) > case CHIP_RAVEN: > case CHIP_NAVI10: > + if (amdgpu_device_asic_is_blockchain_sku(pdev)) { > + DRM_INFO("(%s 0x%04X:0x%04X 0x%04X:0x%04X 0x%02X) has no dc support.\n", > + amdgpu_asic_name[asic_type], pdev->vendor, pdev->device, > + pdev->subsystem_vendor, pdev->subsystem_device, pdev->revision); > + return false; > + } > + return amdgpu_dc != 0; > case CHIP_NAVI14: > case CHIP_NAVI12: > case CHIP_RENOIR: > @@ -3031,7 +3055,7 @@ bool amdgpu_device_has_dc_support(struct amdgpu_device *adev) > if (amdgpu_sriov_vf(adev) || adev->enable_virtual_display) > return false; > > - return amdgpu_device_asic_has_dc_support(adev->asic_type); > + return amdgpu_device_asic_has_dc_support(adev->asic_type, adev->pdev); > } > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 9e92d2a070ac..97014458d7de 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -516,7 +516,7 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev, > */ > if ((bo_flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) && > amdgpu_bo_support_uswc(bo_flags) && > - amdgpu_device_asic_has_dc_support(adev->asic_type)) { > + amdgpu_device_asic_has_dc_support(adev->asic_type, adev->pdev)) { > switch (adev->asic_type) { > case CHIP_CARRIZO: > case CHIP_STONEY: > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 13723914fa9f..97fda825e0d3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -1109,7 +1109,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, > bool supports_atomic = false; > > if (!amdgpu_virtual_display && > - amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK)) > + amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK, pdev)) > supports_atomic = true; > > if ((flags & AMD_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) { > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://nam11.safelinks.protection.outlook.com/?url=""> |
_______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
