drm/amd/amdgpu: Use IP discovery data to determine VCN enablement instead of MMSCH
Subsystems (2)
PATCH v3 1/1 drm/amd/amdgpu: Use IP discovery data to determine VCN enablement instead of MMSCH
From: Bokun Zhang <[email protected]>
In the past, we use MMSCH to determine whether a VCN is enabled or not. This is not reliable since after a FLR, MMSCH may report junk data.
It is better to use IP discovery data.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 8 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 23 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +++++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 53 +++++-------------- 5 files changed, 61 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +8 -0
@@ -373,6 +373,14 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int nreturn -EINVAL ; } + +int amdgpu_discovery_get_vcn_version (struct amdgpu_device *adev,int vcn_instance, +int *major,int *minor,int *revision) +{ +return amdgpu_discovery_get_ip_version (adev,VCN_HWID , + vcn_instance, major, minor, revision); +} +void amdgpu_discovery_harvest_ip (struct amdgpu_device *adev) {struct binary_header *bhdr;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +3 -0
@@ -32,6 +32,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);void amdgpu_discovery_harvest_ip (struct amdgpu_device *adev);int amdgpu_discovery_get_ip_version (struct amdgpu_device *adev,int hw_id,int number_instance,int *major,int *minor,int *revision); + +int amdgpu_discovery_get_vcn_version (struct amdgpu_device *adev,int vcn_instance, +int *major,int *minor,int *revision);int amdgpu_discovery_get_gfx_info (struct amdgpu_device *adev);#endif /* __AMDGPU_DISCOVERY__ */
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +23 -0
@@ -287,6 +287,29 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)return 0 ; } +bool amdgpu_vcn_is_disabled_vcn (struct amdgpu_device *adev,enum vcn_ring_type type,uint32_t vcn_instance) +{ +bool ret = false; + +int major; +int minor; +int revision; + +/* if cannot find IP data, then this VCN does not exist */ +if (amdgpu_discovery_get_vcn_version (adev, vcn_instance, &major, &minor, &revision) !=0 ) +return true; + +if ((type ==VCN_ENCODE_RING ) && (revision &VCN_BLOCK_ENCODE_DISABLE_MASK )) { + ret = true; + }else if ((type ==VCN_DECODE_RING ) && (revision &VCN_BLOCK_DECODE_DISABLE_MASK )) { + ret = true; + }else if ((type ==VCN_UNIFIED_RING ) && (revision &VCN_BLOCK_QUEUE_DISABLE_MASK )) { + ret = true; + } + +return ret; +} +int amdgpu_vcn_suspend (struct amdgpu_device *adev) {unsigned size;
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +13 -0
@@ -280,6 +280,16 @@ struct amdgpu_vcn_decode_buffer {uint32_t pad[30 ]; }; +#define VCN_BLOCK_ENCODE_DISABLE_MASK 0x80 +#define VCN_BLOCK_DECODE_DISABLE_MASK 0x40 +#define VCN_BLOCK_QUEUE_DISABLE_MASK 0xC0 + +enum vcn_ring_type { +VCN_ENCODE_RING , +VCN_DECODE_RING , +VCN_UNIFIED_RING , +}; +int amdgpu_vcn_sw_init (struct amdgpu_device *adev);int amdgpu_vcn_sw_fini (struct amdgpu_device *adev);int amdgpu_vcn_suspend (struct amdgpu_device *adev);
@@ -287,6 +297,9 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev);void amdgpu_vcn_ring_begin_use (struct amdgpu_ring *ring);void amdgpu_vcn_ring_end_use (struct amdgpu_ring *ring); +bool amdgpu_vcn_is_disabled_vcn (struct amdgpu_device *adev, +enum vcn_ring_type type,uint32_t vcn_instance); +int amdgpu_vcn_dec_ring_test_ring (struct amdgpu_ring *ring);int amdgpu_vcn_dec_ring_test_ib (struct amdgpu_ring *ring,long timeout);int amdgpu_vcn_dec_sw_ring_test_ring (struct amdgpu_ring *ring);
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +14 -39
94 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
________________________________
From: amd-gfx <[email protected]> on behalf of Peng Ju Zhou <[email protected]>
Sent: Thursday, June 17, 2021 3:46 AM
To: [email protected] <[email protected]>
Cc: Zhang, Bokun <[email protected]>
Subject: [PATCH v3] drm/amd/amdgpu: Use IP discovery data to determine VCN enablement instead of MMSCH
From: Bokun Zhang <[email protected]>
In the past, we use MMSCH to determine whether a VCN is enabled or not. This is not reliable since after a FLR, MMSCH may report junk data.
It is better to use IP discovery data.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 8 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 23 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +++++ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 53 +++++-------------- 5 files changed, 61 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +8 -0
@@ -373,6 +373,14 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int nreturn -EINVAL ; } + +int amdgpu_discovery_get_vcn_version (struct amdgpu_device *adev,int vcn_instance, +int *major,int *minor,int *revision) +{ +return amdgpu_discovery_get_ip_version (adev,VCN_HWID , + vcn_instance, major, minor, revision); +} +void amdgpu_discovery_harvest_ip (struct amdgpu_device *adev) {struct binary_header *bhdr;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +3 -0
@@ -32,6 +32,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);void amdgpu_discovery_harvest_ip (struct amdgpu_device *adev);int amdgpu_discovery_get_ip_version (struct amdgpu_device *adev,int hw_id,int number_instance,int *major,int *minor,int *revision); + +int amdgpu_discovery_get_vcn_version (struct amdgpu_device *adev,int vcn_instance, +int *major,int *minor,int *revision);int amdgpu_discovery_get_gfx_info (struct amdgpu_device *adev);#endif /* __AMDGPU_DISCOVERY__ */
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +23 -0
@@ -287,6 +287,29 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)return 0 ; } +bool amdgpu_vcn_is_disabled_vcn (struct amdgpu_device *adev,enum vcn_ring_type type,uint32_t vcn_instance) +{ +bool ret = false; + +int major; +int minor; +int revision; + +/* if cannot find IP data, then this VCN does not exist */ +if (amdgpu_discovery_get_vcn_version (adev, vcn_instance, &major, &minor, &revision) !=0 ) +return true; + +if ((type ==VCN_ENCODE_RING ) && (revision &VCN_BLOCK_ENCODE_DISABLE_MASK )) { + ret = true; + }else if ((type ==VCN_DECODE_RING ) && (revision &VCN_BLOCK_DECODE_DISABLE_MASK )) { + ret = true; + }else if ((type ==VCN_UNIFIED_RING ) && (revision &VCN_BLOCK_QUEUE_DISABLE_MASK )) { + ret = true; + } + +return ret; +} +int amdgpu_vcn_suspend (struct amdgpu_device *adev) {unsigned size;
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +13 -0
@@ -280,6 +280,16 @@ struct amdgpu_vcn_decode_buffer {uint32_t pad[30 ]; }; +#define VCN_BLOCK_ENCODE_DISABLE_MASK 0x80 +#define VCN_BLOCK_DECODE_DISABLE_MASK 0x40 +#define VCN_BLOCK_QUEUE_DISABLE_MASK 0xC0 + +enum vcn_ring_type { +VCN_ENCODE_RING , +VCN_DECODE_RING , +VCN_UNIFIED_RING , +}; +int amdgpu_vcn_sw_init (struct amdgpu_device *adev);int amdgpu_vcn_sw_fini (struct amdgpu_device *adev);int amdgpu_vcn_suspend (struct amdgpu_device *adev);
@@ -287,6 +297,9 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev);void amdgpu_vcn_ring_begin_use (struct amdgpu_ring *ring);void amdgpu_vcn_ring_end_use (struct amdgpu_ring *ring); +bool amdgpu_vcn_is_disabled_vcn (struct amdgpu_device *adev, +enum vcn_ring_type type,uint32_t vcn_instance); +int amdgpu_vcn_dec_ring_test_ring (struct amdgpu_ring *ring);int amdgpu_vcn_dec_ring_test_ib (struct amdgpu_ring *ring,long timeout);int amdgpu_vcn_dec_sw_ring_test_ring (struct amdgpu_ring *ring);
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +14 -39
94 lines not on this page · raw message
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C10420624e72c44cc5edd08d93163fe4e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637595127876624163%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=5MzzuTLBnE5tFffBAMinenV5MVHWOG0lZH3jAnBbvzg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx