drm/amdgpu: disable DCN and VCN for Navi14 0x7340/C9 SKU
Subsystems (2)
PATCH 1/2 drm/amdgpu: disable DCN and VCN for Navi14 0x7340/C9 SKU
Navi14 0x7340/C9 SKU has no display and video support, remove them.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -2
@@ -495,8 +495,9 @@ void nv_set_virt_ops(struct amdgpu_device *adev)static bool nv_is_blockchain_sku (struct pci_dev *pdev) { -if (pdev->device ==0x731E && - (pdev->revision ==0xC6 || pdev->revision ==0xC7 )) +if ((pdev->device ==0x731E && + (pdev->revision ==0xC6 || pdev->revision ==0xC7 )) || + (pdev->device ==0x7340 && pdev->revision ==0xC9 ))return true;return false; }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: rename nv_is_headless_sku()
for headless NAVI ASICs
--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -493,7 +493,7 @@ void nv_set_virt_ops(struct amdgpu_device *adev) adev->virt.ops = &xgpu_nv_virt_ops; } -static bool nv_is_blockchain_sku (struct pci_dev *pdev) +static bool nv_is_headless_sku (struct pci_dev *pdev) { if ((pdev->device == 0x731E && (pdev->revision == 0xC6 || pdev->revision == 0xC7)) ||
@@ -536,7 +536,7 @@ int nv_set_ip_blocks(struct amdgpu_device *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) && - !nv_is_blockchain_sku(adev->pdev)) + !nv_is_headless_sku(adev->pdev)) amdgpu_device_ip_block_add(adev, &dm_ip_block);#endif amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);
@@ -544,7 +544,7 @@ 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); -if (!nv_is_blockchain_sku (adev->pdev)) +if (!nv_is_headless_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)
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: rename nv_is_headless_sku()
[AMD Public Use]
Series is: Reviewed-by: Guchun Chen <[email protected]>
Regards,
Guchun
-----Original Message-----
From: Cui, Flora <[email protected]>
Sent: Wednesday, October 28, 2020 2:07 PM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Xu, Feifei <[email protected]>; Chen, Guchun <[email protected]>; Cui, Flora <[email protected]>; Teng, Rui <[email protected]>; Long, Gang <[email protected]>; Yin, Tianci (Rico) <[email protected]>; Cui, Flora <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: rename nv_is_headless_sku()
for headless NAVI ASICs
--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +1 -1
@@ -493,7 +493,7 @@ void nv_set_virt_ops(struct amdgpu_device *adev) adev->virt.ops = &xgpu_nv_virt_ops; } -static bool nv_is_blockchain_sku (struct pci_dev *pdev) +static bool nv_is_headless_sku (struct pci_dev *pdev) { if ((pdev->device == 0x731E && (pdev->revision == 0xC6 || pdev->revision == 0xC7)) || @@ -536,7 +536,7 @@ int nv_set_ip_blocks(struct amdgpu_device *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) &&
- !nv_is_blockchain_sku(adev->pdev))
+ !nv_is_headless_sku(adev->pdev))
amdgpu_device_ip_block_add(adev, &dm_ip_block); #endif
amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); @@ -544,7 +544,7 @@ 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);
- if (!nv_is_blockchain_sku(adev->pdev))
+ if (!nv_is_headless_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)
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx