diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2021-02-02 11:11:45 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-02-26 17:23:49 -0500 |
| commit | 6f786950b1ff051c6dd913b1bb3aaa9b57befcbf (patch) | |
| tree | ae483eb6352789d5e5930c2f38db12cdf6054de3 /drivers/gpu/drm/amd/amdgpu/soc15.c | |
| parent | b50368da619fb1b721ea3c8fd6a28a719233f6ee (diff) | |
| download | linux-stable-6f786950b1ff051c6dd913b1bb3aaa9b57befcbf.tar.gz linux-stable-6f786950b1ff051c6dd913b1bb3aaa9b57befcbf.tar.bz2 linux-stable-6f786950b1ff051c6dd913b1bb3aaa9b57befcbf.zip | |
drm/amdgpu/codec: drop the internal codec index
And just use the ioctl index. They are the same.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index f4735d83126b..230caaa3513f 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -25,6 +25,8 @@ #include <linux/module.h> #include <linux/pci.h> +#include <drm/amdgpu_drm.h> + #include "amdgpu.h" #include "amdgpu_atombios.h" #include "amdgpu_ih.h" @@ -87,14 +89,14 @@ static const struct amdgpu_video_codec_info vega_video_codecs_encode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 4096, .max_height = 2304, .max_pixels_per_frame = 4096 * 2304, .max_level = 0, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_HEVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, .max_width = 4096, .max_height = 2304, .max_pixels_per_frame = 4096 * 2304, @@ -112,42 +114,42 @@ static const struct amdgpu_video_codecs vega_video_codecs_encode = static const struct amdgpu_video_codec_info vega_video_codecs_decode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG2, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 3, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 5, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 52, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VC1, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 4, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_HEVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 186, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_JPEG, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, @@ -165,49 +167,49 @@ static const struct amdgpu_video_codecs vega_video_codecs_decode = static const struct amdgpu_video_codec_info rv_video_codecs_decode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG2, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 3, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 5, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 52, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VC1, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 4, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_HEVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 186, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_JPEG, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 0, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VP9, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, @@ -225,49 +227,49 @@ static const struct amdgpu_video_codecs rv_video_codecs_decode = static const struct amdgpu_video_codec_info rn_video_codecs_decode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG2, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 3, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 5, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 52, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VC1, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 4, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_HEVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, .max_width = 8192, .max_height = 4352, .max_pixels_per_frame = 4096 * 4096, .max_level = 186, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_JPEG, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, .max_width = 4096, .max_height = 4096, .max_pixels_per_frame = 4096 * 4096, .max_level = 0, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VP9, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, .max_width = 8192, .max_height = 4352, .max_pixels_per_frame = 4096 * 4096, |