[PATCH 3/3] drm/amdgpu: disable VCN for navi10 blockchain SKU
From: "Tianci.Yin" The blockchain SKU has no VCN support, remove it. Change-Id: I26fbdabdf67aada24c5aebef999ee8b5f9c0bfe2 Reviewed-by: Guchun Chen Signed-off-by: Tianci.Yin --- drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index ce787489aaeb..bf28d7547237 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -538,7 +538,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 (!amdgpu_device_asic_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 https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 3/3] drm/amdgpu: disable VCN for navi10 blockchain SKU
On 2020-10-21 03:56, Tianci Yin wrote: > From: "Tianci.Yin" > > The blockchain SKU has no VCN support, remove it. > > Change-Id: I26fbdabdf67aada24c5aebef999ee8b5f9c0bfe2 > Signed-off-by: Tianci.Yin > --- > drivers/gpu/drm/amd/amdgpu/nv.c | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c > index ce787489aaeb..ffe4c2b3ea5f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/nv.c > +++ b/drivers/gpu/drm/amd/amdgpu/nv.c > @@ -538,7 +538,10 @@ 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 (adev->pdev->device != 0x731E || > + (adev->pdev->revision != 0xC6 && > + adev->pdev->revision != 0xC7)) > + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); It would be much easier to read and understand this conditional, if you'd copy the conditional you have in patch 2, and add an inversion to the front: if (!(device is block-chain SKU)) add IP block header vcn2; And you'd maintain similarity to an already introduced conditional, for instance of someone is doing a search through the code. Regards, Luben > 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); > ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH 3/3] drm/amdgpu: disable VCN for navi10 blockchain SKU
From: "Tianci.Yin" The blockchain SKU has no VCN support, remove it. Change-Id: I26fbdabdf67aada24c5aebef999ee8b5f9c0bfe2 Signed-off-by: Tianci.Yin --- drivers/gpu/drm/amd/amdgpu/nv.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index ce787489aaeb..ffe4c2b3ea5f 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -538,7 +538,10 @@ 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 (adev->pdev->device != 0x731E || + (adev->pdev->revision != 0xC6 && +adev->pdev->revision != 0xC7)) + 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 https://lists.freedesktop.org/mailman/listinfo/amd-gfx
