From: Asad Kamal Date: Fri, 14 Feb 2025 05:54:01 +0000 (+0800) Subject: drm/amd/pm: Limit jpeg rings as per max for jpeg_v_4_0_3 X-Git-Tag: v6.15-rc1~120^2~17^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1118df145faab925637da0e02c53e8b3072699a;p=thirdparty%2Fkernel%2Flinux.git drm/amd/pm: Limit jpeg rings as per max for jpeg_v_4_0_3 Since pmfw supports for smuv13_0_6 is limited to 8 jpeg rings per instance, which is the max for jpeg_v_4_0_3. Limit it to same to avoid out of bound access. Fixes: 568199a5c7a9 ("drm/amd/pm: Limit to 8 jpeg rings per instance") Signed-off-by: Asad Kamal Reviewed-by: Lijo Lazar Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c index 3fa671f4981cd..9f2de69f53b28 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c @@ -2644,7 +2644,7 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table per_inst = smu_v13_0_6_cap_supported(smu, SMU_CAP(PER_INST_METRICS)); - num_jpeg_rings = max_t(u8, adev->jpeg.num_jpeg_rings, 8); + num_jpeg_rings = AMDGPU_MAX_JPEG_RINGS_4_0_3; for_each_xcp(adev->xcp_mgr, xcp, i) { amdgpu_xcp_get_inst_details(xcp, AMDGPU_XCP_VCN, &inst_mask); idx = 0;