* [PATCH 1/2] drm/amdgpu: add DID for navi10 blockchain SKU
@ 2020-10-22 3:43 Tianci Yin
2020-10-22 3:43 ` [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) Tianci Yin
0 siblings, 1 reply; 5+ messages in thread
From: Tianci Yin @ 2020-10-22 3:43 UTC (permalink / raw)
To: amd-gfx
Cc: Long Gang, Guchun Chen, Feifei Xu, Tianci Yin, Tuikov Luben,
Deucher Alexander, Flora Cui, Hawking Zhang
From: "Tianci.Yin" <tianci.yin@amd.com>
Change-Id: I58129e3aa88369c85929e4dde002cf43c3ff288a
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Tianci.Yin <tianci.yin@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 564336c2ee66..13723914fa9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1066,6 +1066,7 @@ static const struct pci_device_id pciidlist[] = {
{0x1002, 0x7319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},
{0x1002, 0x731A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},
{0x1002, 0x731B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},
+ {0x1002, 0x731E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},
{0x1002, 0x731F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},
/* Navi14 */
{0x1002, 0x7340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14},
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3)
2020-10-22 3:43 [PATCH 1/2] drm/amdgpu: add DID for navi10 blockchain SKU Tianci Yin
@ 2020-10-22 3:43 ` Tianci Yin
2020-10-22 3:45 ` Alex Deucher
0 siblings, 1 reply; 5+ messages in thread
From: Tianci Yin @ 2020-10-22 3:43 UTC (permalink / raw)
To: amd-gfx
Cc: Long Gang, Guchun Chen, Feifei Xu, Tianci Yin, Tuikov Luben,
Deucher Alexander, Flora Cui, Hawking Zhang
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)
+{
+ 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
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3)
2020-10-22 3:43 ` [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) Tianci Yin
@ 2020-10-22 3:45 ` Alex Deucher
2020-10-22 3:47 ` Yin, Tianci (Rico)
2020-10-23 3:16 ` Luben Tuikov
0 siblings, 2 replies; 5+ messages in thread
From: Alex Deucher @ 2020-10-22 3:45 UTC (permalink / raw)
To: Tianci Yin
Cc: Long Gang, Guchun Chen, Feifei Xu, amd-gfx list, Tuikov Luben,
Deucher Alexander, Flora Cui, Hawking Zhang
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
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3)
2020-10-22 3:45 ` Alex Deucher
@ 2020-10-22 3:47 ` Yin, Tianci (Rico)
2020-10-23 3:16 ` Luben Tuikov
1 sibling, 0 replies; 5+ messages in thread
From: Yin, Tianci (Rico) @ 2020-10-22 3:47 UTC (permalink / raw)
To: Alex Deucher
Cc: Long, Gang, Chen, Guchun, Xu, Feifei, amd-gfx list, Tuikov,
Luben, Deucher, Alexander, Cui, Flora, Zhang, Hawking
[-- Attachment #1.1: Type: text/plain, Size: 3686 bytes --]
[AMD Official Use Only - Internal Distribution Only]
Thanks very much Alex!
________________________________
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)
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
> 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
[-- Attachment #1.2: Type: text/html, Size: 7367 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3)
2020-10-22 3:45 ` Alex Deucher
2020-10-22 3:47 ` Yin, Tianci (Rico)
@ 2020-10-23 3:16 ` Luben Tuikov
1 sibling, 0 replies; 5+ messages in thread
From: Luben Tuikov @ 2020-10-23 3:16 UTC (permalink / raw)
To: Alex Deucher, Tianci Yin
Cc: Long Gang, Guchun Chen, Feifei Xu, amd-gfx list,
Deucher Alexander, Flora Cui, Hawking Zhang
On 2020-10-21 23:45, Alex Deucher wrote:
> 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;
>> +}
Not only can this function be static, but this function
can simply be
{
return pdev->device == 0x731E &&
(pdev->revision == 0xC6 || pdev->revision == 0xC7);
}
:-)
Regards,
Luben
>> +
>> 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
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CLuben.Tuikov%40amd.com%7C69a8d879c10a4a95df8408d8763d00da%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637389351678043728%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=rW2Fz1NGYDoUQ3TlHAXmoDC9zDhBrBmxMtKtrsK0Fhk%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-23 3:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-22 3:43 [PATCH 1/2] drm/amdgpu: add DID for navi10 blockchain SKU Tianci Yin
2020-10-22 3:43 ` [PATCH 2/2] drm/amdgpu: disable DCN and VCN for navi10 blockchain SKU(v3) Tianci Yin
2020-10-22 3:45 ` Alex Deucher
2020-10-22 3:47 ` Yin, Tianci (Rico)
2020-10-23 3:16 ` Luben Tuikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).