drm/amd/amdgpu: Use IP discovery data to determine VCN enablement instead of MMSCH
Subsystems (2)
PATCH v2 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 | 52 +++++-------------- 5 files changed, 60 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 +13 -39
93 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
Quoted 24 lines · Peng Ju Zhou
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.
Signed-off-by Bokun Zhang <[email protected]>Signed-off-by Peng Ju Zhou <[email protected]>--- 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 | 52 +++++-------------- 5 files changed, 60 insertions(+), 39 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0
-0@@ -373,6 +373,14 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int nreturn -EINVAL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int n · line 383
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +8
-0} + +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); +} +
I think you can drop this wrapper and just callamdgpu_discovery_get_ip_version() directly fromamdgpu_vcn_is_disabled_vcn().
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0
-0void 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 +0
-0@@ -287,6 +287,29 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device *adev) · line 299
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +10
-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 )
Just call amdgpu_discovery_get_ip_version() directly here.
Quoted 74 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +13
-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 +4
-2@@ -85,9 +85,12 @@ static void vcn_v3_0_enc_ring_set_wptr(struct amdgpu_ring *ring);static int vcn_v3_0_early_init (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int i;if (amdgpu_sriov_vf (adev)) { - adev->vcn.num_vcn_inst =VCN_INSTANCES_SIENNA_CICHLID ; +for (i =0 ; i <VCN_INSTANCES_SIENNA_CICHLID ; i++) +if (amdgpu_vcn_is_disabled_vcn (adev,VCN_DECODE_RING , i)) + adev->vcn.num_vcn_inst++; adev->vcn.harvest_config =0 ; adev->vcn.num_enc_rings =1 ;@@ -99,7 +102,6 @@ static int vcn_v3_0_early_init(void *handle) }else {if (adev->asic_type ==CHIP_SIENNA_CICHLID ) {u32 harvest; -int i; adev->vcn.num_vcn_inst =VCN_INSTANCES_SIENNA_CICHLID ;for (i =0 ; i < adev->vcn.num_vcn_inst; i++) {
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c static int vcn_v3_0_sw_init(void *handle) · line 159
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1
-1@@ -154,7 +156,7 @@ static int vcn_v3_0_sw_init(void *handle) adev->firmware.fw_size +=ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); -if (adev->vcn.num_vcn_inst ==VCN_INSTANCES_SIENNA_CICHLID ) { +if (adev->asic_type ==CHIP_SIENNA_CICHLID ) {
Is this change safe? Will this break anything on harvested boards? Other than these comments the patch looks good.
Alex
Quoted 74 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +8
-37adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1 ].ucode_id =AMDGPU_UCODE_ID_VCN1 ; adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1 ].fw = adev->vcn.fw; adev->firmware.fw_size +=@@ -324,19 +326,17 @@ static int vcn_v3_0_hw_init(void *handle)continue ; ring = &adev->vcn.inst[i].ring_dec; -if (ring->sched.ready) { - ring->wptr =0 ; - ring->wptr_old =0 ; -vcn_v3_0_dec_ring_set_wptr (ring); - } + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v3_0_dec_ring_set_wptr (ring); + ring->sched.ready = true;for (j =0 ; j < adev->vcn.num_enc_rings; ++j) { ring = &adev->vcn.inst[i].ring_enc[j]; -if (ring->sched.ready) { - ring->wptr =0 ; - ring->wptr_old =0 ; -vcn_v3_0_enc_ring_set_wptr (ring); - } + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v3_0_enc_ring_set_wptr (ring); + ring->sched.ready = true; } } }else {@@ -1303,8 +1303,6 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev)uint32_t table_size;uint32_t size, size_dw; -bool is_vcn_ready; -struct mmsch_v3_0_cmd_direct_write direct_wt = { {0 } };struct mmsch_v3_0_cmd_direct_read_modify_write @@ -1496,30 +1494,6 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev) } } -/* 6, check each VCN's init_status -* if it remains as 0, then this VCN is not assigned to current VF -* do not start ring for this VCN -*/ - size =sizeof (struct mmsch_v3_0_init_header ); - table_loc = (uint32_t *)table->cpu_addr; -memcpy (&header, (void *)table_loc, size); - -for (i =0 ; i < adev->vcn.num_vcn_inst; i++) { -if (adev->vcn.harvest_config & (1 << i)) -continue ; - - is_vcn_ready = (header.inst[i].init_status ==1 ); -if (!is_vcn_ready) -DRM_INFO ("VCN(%d) engine is disabled by hypervisor\n" , i); - - ring = &adev->vcn.inst[i].ring_dec; - ring->sched.ready = is_vcn_ready; -for (j =0 ; j < adev->vcn.num_enc_rings; ++j) { - ring = &adev->vcn.inst[i].ring_enc[j]; - ring->sched.ready = is_vcn_ready; - } - } -return 0 ; } --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
Hi Alex
Update inline
Quoted 84 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, June 16, 2021 3:29 AM
To: Zhou, Peng Ju <[email protected]>
Cc: amd-gfx list <[email protected]>; Zhang, Bokun <[email protected]>
Subject: Re: [PATCH v2] drm/amd/amdgpu: Use IP discovery data to determine VCN enablement instead of MMSCHdrivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c int amdgpu_discovery_get_ip_version(struct
Quoted 24 lines · Peng Ju Zhou
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.
Signed-off-by Bokun Zhang <[email protected]>Signed-off-by Peng Ju Zhou <[email protected]>--- 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 | 52 +++++-------------- 5 files changed, 60 insertions(+), 39 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0
-0@@ -373,6 +373,14 @@ int amdgpu_discovery_get_ip_version(struct
amdgpu_device*adev, inthw_id, int ndrivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int n
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +2
-0return -EINVAL ; } + +int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int
vcn_instance,drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c int amdgpu_discovery_get_ip_version(struct · line 383
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +6
-0+ int *major, int *minor, int +*revision) { + return amdgpu_discovery_get_ip_version(adev, VCN_HWID, +vcn_instance ,major , +minor ,revision ); } +I think you can drop this wrapper and just call
amdgpu_discovery_get_ip_version()directly fromamdgpu_vcn_is_disabled_vcn().Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0
-0void amdgpu_discovery_harvest_ip (struct amdgpu_device *adev) {struct binary_header *bhdr;drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +0
-0@@ -32,6 +32,9 @@ int amdgpu_discovery_reg_base_init(struct
amdgpu_device*adev); voidamdgpu_discovery_harvest_ip(struct amdgpu_device *adev); int amdgpu_discovery_get_ip_version(struct
amdgpu_device*adev, inthw_id, intnumber_instance,drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
Quoted 4 lines
int *major, int *minor, int
*revision);drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2
-0+ +int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int
vcn_instance,drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +2
-0+ 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 +0
-0@@ -287,6 +287,29 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device*adev)
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +0
-0return 0 ; }
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +11
-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 )Just call
amdgpu_discovery_get_ip_version()directly here.
If call amdgpu_discovery_get_ip_version() directly, we have to include header soc15_hw_ip.h
I have 2 concern:
1. amdgpu_vcn.c is ASIC independent file, but soc15_hw_ip.h is ASIC related file, Can we add the header to amdgpu_vcn.c?
2. From design perspective, is it better to use a wrapper than including a header file which may increase the size of hex file?
Quoted 82 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3
-0+return true; + + if ((type == VCN_ENCODE_RING) && (revision &
VCN_BLOCK_ENCODE_DISABLE_MASK)) {drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device · line 305
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2
-0+ ret = true; + } else if ((type == VCN_DECODE_RING) && (revision &
VCN_BLOCK_DECODE_DISABLE_MASK)) {drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c int amdgpu_vcn_sw_fini(struct amdgpu_device · line 307
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2
-0+ ret = true; + } else if ((type == VCN_UNIFIED_RING) && (revision &
VCN_BLOCK_QUEUE_DISABLE_MASK)) {Quoted 72 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +6
-0+ ret = true; + } + +return ret; +} +int amdgpu_vcn_suspend (struct amdgpu_device *adev) {unsigned size;drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +10
-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); intamdgpu_vcn_suspend(struct amdgpu_device *adev); @@ -287,6 +297,9 @@ intamdgpu_vcn_resume(struct amdgpu_device *adev); voidamdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring); voidamdgpu_vcn_ring_end_use(struct amdgpu_ring *ring);drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +4
-0+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); intamdgpu_vcn_dec_sw_ring_test_ring(struct amdgpu_ring *ring); diff --gita/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.cb/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
indexce3c794c176f..a79ae86bc752100644drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +4
-2@@ -85,9 +85,12 @@ static void vcn_v3_0_enc_ring_set_wptr(struct amdgpu_ring *ring); static int vcn_v3_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int i;if (amdgpu_sriov_vf (adev)) { - adev->vcn.num_vcn_inst =VCN_INSTANCES_SIENNA_CICHLID ; +for (i =0 ; i <VCN_INSTANCES_SIENNA_CICHLID ; i++) +if (amdgpu_vcn_is_disabled_vcn (adev,VCN_DECODE_RING , i)) + adev->vcn.num_vcn_inst++; adev->vcn.harvest_config =0 ; adev->vcn.num_enc_rings =1 ;@@ -99,7 +102,6 @@ static int vcn_v3_0_early_init(void *handle) }else {if (adev->asic_type ==CHIP_SIENNA_CICHLID ) {u32 harvest; -int i; adev->vcn.num_vcn_inst =VCN_INSTANCES_SIENNA_CICHLID ;for (i =0 ; i < adev->vcn.num_vcn_inst; i++) {@@ -154,7 +156,7 @@ static int vcn_v3_0_sw_init(void *handle) adev->firmware.fw_size +=ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE );
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c static int vcn_v3_0_sw_init(void *handle) · line 159
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1
-1-if (adev->vcn.num_vcn_inst ==VCN_INSTANCES_SIENNA_CICHLID ) { +if (adev->asic_type ==CHIP_SIENNA_CICHLID ) {Is this change safe? Will this break anything on harvested boards? Other than these comments the patch looks good.
Will change it.
Quoted 90 lines
Alex
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c static int vcn_v3_0_sw_init(void *handle) · line 161
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-0adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].ucode_id =
AMDGPU_UCODE_ID_VCN1;drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c static int vcn_v3_0_start_sriov(struct
Quoted 32 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-0adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].fw = adev-vcn.fw; adev->firmware.fw_size += @@ -324,19 +326,17 @@ static int vcn_v3_0_hw_init(void *handle) continue; ring = &adev->vcn.inst[i].ring_dec;drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +8
-10-if (ring->sched.ready) { - ring->wptr =0 ; - ring->wptr_old =0 ; -vcn_v3_0_dec_ring_set_wptr (ring); - } + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v3_0_dec_ring_set_wptr (ring); + ring->sched.ready = true;for (j =0 ; j < adev->vcn.num_enc_rings; ++j) { ring = &adev->vcn.inst[i].ring_enc[j]; -if (ring->sched.ready) { - ring->wptr =0 ; - ring->wptr_old =0 ; -vcn_v3_0_enc_ring_set_wptr (ring); - } + ring->wptr =0 ; + ring->wptr_old =0 ; +vcn_v3_0_enc_ring_set_wptr (ring); + ring->sched.ready = true; } } }else {@@ -1303,8 +1303,6 @@ static int vcn_v3_0_start_sriov(struct
amdgpu_device*adev)drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c static int vcn_v3_0_start_sriov(struct
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-2uint32_t table_size;uint32_t size, size_dw; -bool is_vcn_ready; -struct mmsch_v3_0_cmd_direct_write direct_wt = { {0 } };struct mmsch_v3_0_cmd_direct_read_modify_write @@ -1496,30 +1494,6 @@ static int vcn_v3_0_start_sriov(struct
amdgpu_device*adev)Quoted 33 lines
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0
-25} } -/* 6, check each VCN's init_status -* if it remains as 0, then this VCN is not assigned to current VF -* do not start ring for this VCN -*/ - size =sizeof (struct mmsch_v3_0_init_header ); - table_loc = (uint32_t *)table->cpu_addr; -memcpy (&header, (void *)table_loc, size); - -for (i =0 ; i < adev->vcn.num_vcn_inst; i++) { -if (adev->vcn.harvest_config & (1 << i)) -continue ; - - is_vcn_ready = (header.inst[i].init_status ==1 ); -if (!is_vcn_ready) -DRM_INFO ("VCN(%d) engine is disabled by hypervisor\n" , i); - - ring = &adev->vcn.inst[i].ring_dec; - ring->sched.ready = is_vcn_ready; -for (j =0 ; j < adev->vcn.num_enc_rings; ++j) { - ring = &adev->vcn.inst[i].ring_enc[j]; - ring->sched.ready = is_vcn_ready; - } - } -return 0 ; } --2.17.1
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CPe
Quoted 1 line
ngJu.Zhou%40amd.com%7C03db0d21b4954eb34a0308d93033d2b5%7C3dd89
61fe4884Quoted 1 line
Quoted 9 lines
e608e11a82d994e183d%7C0%7C0%7C637593821403612572%7CUnknown%7C TWFpbGZsb
Quoted 1 line
3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0% 3D%
Quoted 1 line
7C1000&sdata=CTur5LY8Nc8OlpJ5a1G4TlJe96CXEZ2%2BRpqaLc%2F%2FiP o%3D&
Quoted 1 line
amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx