drm/amdgpu/vcn: port mmsch ctx table size fix from jpeg v4
Subsystems (2)
PATCH 1/1 drm/amdgpu/vcn: port mmsch ctx table size fix from jpeg v4
add jpeg table size to ctx table size rather than override it
v2:
save jpeg header info otherwise it will lose debug info
Signed-off-by Jane Jian <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +5 -2
@@ -200,9 +200,12 @@ static int jpeg_v4_0_3_start_sriov(struct amdgpu_device *adev)for (i =0 ; i < adev->jpeg.num_jpeg_inst; i++) { jpeg_inst =GET_INST (JPEG , i); -memset (&header,0 ,sizeof (struct mmsch_v4_0_3_init_header )); + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy (&header, (void *)table_loc, size); + header.version =MMSCH_VERSION ; - header.total_size =sizeof (struct mmsch_v4_0_3_init_header ) >>2 ; + header.total_size =RREG32_SOC15 (VCN ,0 , regMMSCH_VF_CTX_SIZE); table_loc = (uint32_t *)table->cpu_addr; table_loc += header.total_size;
Signature · 1 line
2.34.1
feel free to add
Reviewed-by Jingwen Chen <[email protected]>
Quoted 28 lines · Jane Jian
add jpeg table size to ctx table size rather than override it
v2:
save jpeg header info otherwise it will lose debug infoSigned-off-by Jane Jian <[email protected]>--- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +5
-2@@ -200,9 +200,12 @@ static int jpeg_v4_0_3_start_sriov(struct amdgpu_device *adev)for (i =0 ; i < adev->jpeg.num_jpeg_inst; i++) { jpeg_inst =GET_INST (JPEG , i); -memset (&header,0 ,sizeof (struct mmsch_v4_0_3_init_header )); + size =sizeof (struct mmsch_v4_0_3_init_header ); + table_loc = (uint32_t *)table->cpu_addr; +memcpy (&header, (void *)table_loc, size); + header.version =MMSCH_VERSION ; - header.total_size =sizeof (struct mmsch_v4_0_3_init_header ) >>2 ; + header.total_size =RREG32_SOC15 (VCN ,0 , regMMSCH_VF_CTX_SIZE); table_loc = (uint32_t *)table->cpu_addr; table_loc += header.total_size;
Signature · 2 lines
Best Regards, JingWen Chen