Commit 7fc07652 authored by David Rosca's avatar David Rosca Committed by Alex Deucher
Browse files

drm/amdgpu: Remove JPEG from vega and carrizo video caps 



JPEG is only supported for VCN1+.

Signed-off-by: default avatarDavid Rosca <david.rosca@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRuijing Dong <ruijing.dong@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 0a6e7b06)
Cc: stable@vger.kernel.org
parent ec33964d

drivers/gpu/drm/amd/amdgpu/soc15.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static const struct amdgpu_video_codec_info vega_video_codecs_decode_array[] = 
	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4096, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 1920, 1088, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 4096, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

};



static const struct amdgpu_video_codecs vega_video_codecs_decode =

drivers/gpu/drm/amd/amdgpu/vi.c

+0 −7
Original line number Diff line number Diff line
@@ -239,13 +239,6 @@ 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 =