|
[AMD Official Use Only - Internal Distribution Only]
Thanks very much Alex!
From: Alex Deucher <alexdeucher@xxxxxxxxx>
Sent: Thursday, October 22, 2020 11:45 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/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) On Wed, Oct 21, 2020 at 11:43 PM Tianci Yin <tianci.yin@xxxxxxx> wrote:
> > From: "Tianci.Yin" <tianci.yin@xxxxxxx> > > The blockchain SKU has no display and video support, remove them. > > Change-Id: I419cfae8b00125f3bff18c0a8cd92f3266d5f04a > Signed-off-by: Tianci.Yin <tianci.yin@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/nv.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c > index ce787489aaeb..26702c85caf8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/nv.c > +++ b/drivers/gpu/drm/amd/amdgpu/nv.c > @@ -497,6 +497,14 @@ void nv_set_virt_ops(struct amdgpu_device *adev) > adev->virt.ops = &xgpu_nv_virt_ops; > } > > +bool nv_is_blockchain_sku(struct pci_dev *pdev) This can be static. With that fixed, the series is: Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > +{ > + if (pdev->device == 0x731E && > + (pdev->revision == 0xC6 || pdev->revision == 0xC7)) > + return true; > + return false; > +} > + > int nv_set_ip_blocks(struct amdgpu_device *adev) > { > int r; > @@ -530,7 +538,8 @@ 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)) > + else if (amdgpu_device_has_dc_support(adev) && > + !nv_is_blockchain_sku(adev->pdev)) > amdgpu_device_ip_block_add(adev, &dm_ip_block); > #endif > amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); > @@ -538,7 +547,8 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) > if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT && > !amdgpu_sriov_vf(adev)) > amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); > - amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); > + if (!nv_is_blockchain_sku(adev->pdev)) > + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); > amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block); > if (adev->enable_mes) > amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block); > -- > 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
