<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> [AMD Official Use Only - Internal Distribution Only] <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Thanks very much Alex! </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Alex Deucher <alexdeucher@gmail.com> Sent: Thursday, October 22, 2020 11:45 To: Yin, Tianci (Rico) <Tianci.Yin@amd.com> Cc: amd-gfx list <amd-gfx@lists.freedesktop.org>; Long, Gang <Gang.Long@amd.com>; Chen, Guchun <Guchun.Chen@amd.com>; Xu, Feifei <Feifei.Xu@amd.com>; Tuikov, Luben <Luben.Tuikov@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Cui, Flora <Flora.Cui@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com> Subject: Re: [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">On Wed, Oct 21, 2020 at 11:43 PM Tianci Yin <tianci.yin@amd.com> wrote: > > From: "Tianci.Yin" <tianci.yin@amd.com> > > The blockchain SKU has no display and video support, remove them. > > Change-Id: I419cfae8b00125f3bff18c0a8cd92f3266d5f04a > Signed-off-by: Tianci.Yin <tianci.yin@amd.com> > --- > 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@amd.com> > +{ > + 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@lists.freedesktop.org > <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Ctianci.yin%40amd.com%7C69a8d879c10a4a95df8408d8763d00da%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637389351668689049%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BoBEgmT7npcabo5NhzjKxqeyErXx3CKFzK1HNHa8LWU%3D&reserved=0"> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Ctianci.yin%40amd.com%7C69a8d879c10a4a95df8408d8763d00da%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637389351668689049%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BoBEgmT7npcabo5NhzjKxqeyErXx3CKFzK1HNHa8LWU%3D&reserved=0</a> </div> </div> </div> </body> </html>