Skip to content

Commit 7fc0765

Browse files
nowrepalexdeucher
authored andcommitted
drm/amdgpu: Remove JPEG from vega and carrizo video caps
JPEG is only supported for VCN1+. Signed-off-by: David Rosca <david.rosca@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Ruijing Dong <ruijing.dong@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 0a6e7b0) Cc: stable@vger.kernel.org
1 parent ec33964 commit 7fc0765

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ static const struct amdgpu_video_codec_info vega_video_codecs_decode_array[] =
108108
{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4096, 52)},
109109
{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 1920, 1088, 4)},
110110
{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 4096, 186)},
111-
{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},
112111
};
113112

114113
static const struct amdgpu_video_codecs vega_video_codecs_decode =

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,6 @@ static const struct amdgpu_video_codec_info cz_video_codecs_decode_array[] =
239239
.max_pixels_per_frame = 4096 * 4096,
240240
.max_level = 186,
241241
},
242-
{
243-
.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,
244-
.max_width = 4096,
245-
.max_height = 4096,
246-
.max_pixels_per_frame = 4096 * 4096,
247-
.max_level = 0,
248-
},
249242
};
250243

251244
static const struct amdgpu_video_codecs cz_video_codecs_decode =

0 commit comments

Comments
 (0)