diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2021-02-02 19:11:45 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-02-27 01:23:49 +0300 |
| commit | 6f786950b1ff051c6dd913b1bb3aaa9b57befcbf (patch) | |
| tree | ae483eb6352789d5e5930c2f38db12cdf6054de3 /drivers/gpu/drm/amd/amdgpu/si.c | |
| parent | b50368da619fb1b721ea3c8fd6a28a719233f6ee (diff) | |
| download | linux-6f786950b1ff051c6dd913b1bb3aaa9b57befcbf.tar.xz | |
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/si.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 489dbcc7040d..7cbc2bb03bc6 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -26,6 +26,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" @@ -911,7 +913,7 @@ static const u32 hainan_mgcg_cgcg_init[] = static const struct amdgpu_video_codec_info tahiti_video_codecs_encode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 2048, .max_height = 1152, .max_pixels_per_frame = 2048 * 1152, @@ -942,28 +944,28 @@ static const struct amdgpu_video_codecs hainan_video_codecs_encode = static const struct amdgpu_video_codec_info tahiti_video_codecs_decode_array[] = { { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG2, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, .max_width = 2048, .max_height = 1152, .max_pixels_per_frame = 2048 * 1152, .max_level = 3, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, .max_width = 2048, .max_height = 1152, .max_pixels_per_frame = 2048 * 1152, .max_level = 5, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, .max_width = 2048, .max_height = 1152, .max_pixels_per_frame = 2048 * 1152, .max_level = 41, }, { - .codec_type = AMDGPU_VIDEO_CODEC_TYPE_VC1, + .codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, .max_width = 2048, .max_height = 1152, .max_pixels_per_frame = 2048 * 1152, |