drm/amdgpu: Add back JPEG to video caps for carrizo and newer

[ Upstream commit 2036be31741b00f030530381643a8b35a5a42b5c ]

JPEG is not supported on Vega only.

Fixes: 0a6e7b06bdbe ("drm/amdgpu: Remove JPEG from vega and carrizo video caps")
Signed-off-by: David Rosca <david.rosca@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 0f4dfe86fe922c37bcec99dce80a15b4d5d4726d)
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 48ab93e715c823f6d7183cb15d990e2cb490c977..6e4f9c6108f60215bda3d5b141e004bd380837c7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -239,6 +239,13 @@ static const struct amdgpu_video_codec_info cz_video_codecs_decode_array[] =
                .max_pixels_per_frame = 4096 * 4096,
                .max_level = 186,
        },
+       {
+               .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,
+               .max_width = 4096,
+               .max_height = 4096,
+               .max_pixels_per_frame = 4096 * 4096,
+               .max_level = 0,
+       },
 };
 
 static const struct amdgpu_video_codecs cz_video_codecs_decode =