drm/amdgpu: add asic callback for querying video codec info (v2)
Subsystems (3)
PATCH 1/4 drm/amdgpu: add asic callback for querying video codec info (v2)
This will be used by a new INFO ioctl query to fetch the decode and encode capabilities from the kernel driver rather than hardcoding them in mesa. This gives us more fine grained control of capabilities using information that is only availabl in the kernel (e.g., platform limitations or bandwidth restrictions).
v2: reorder the codecs to better align with mesa
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +25 -0
@@ -582,6 +582,27 @@ enum amd_reset_method { AMD_RESET_METHOD_BACO }; +#define AMDGPU_VIDEO_CODEC_TYPE_MPEG2 0 +#define AMDGPU_VIDEO_CODEC_TYPE_MPEG4 1 +#define AMDGPU_VIDEO_CODEC_TYPE_VC1 2 +#define AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC 3 +#define AMDGPU_VIDEO_CODEC_TYPE_HEVC 4 +#define AMDGPU_VIDEO_CODEC_TYPE_JPEG 5 +#define AMDGPU_VIDEO_CODEC_TYPE_VP9 6 +#define AMDGPU_VIDEO_CODEC_TYPE_AV1 7 + +struct amdgpu_video_codec_info { +u32 codec_type; +u32 max_width; +u32 max_height; +u32 max_level; +}; + +struct amdgpu_video_codecs { +const u32 codec_count; +const struct amdgpu_video_codec_info *codec_array; +}; +/* * ASIC specific functions. */
@@ -626,6 +647,9 @@ struct amdgpu_asic_funcs {void (*pre_asic_init)(struct amdgpu_device *adev);/* enter/exit umd stable pstate */ int (*update_umd_stable_pstate)(struct amdgpu_device *adev,bool enter); +/* query video codecs */ +int (*query_video_codecs)(struct amdgpu_device *adev,bool encode, +const struct amdgpu_video_codecs **codecs); };/*
@@ -1218,6 +1242,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_pre_asic_init (adev) (adev)->asic_funcs->pre_asic_init((adev))#define amdgpu_asic_update_umd_stable_pstate (adev, enter) \ ((adev)->asic_funcs->update_umd_stable_pstate ? (adev)->asic_funcs->update_umd_stable_pstate((adev), (enter)) : 0) +#define amdgpu_asic_query_video_codecs (adev, e, c) (adev)->asic_funcs->query_video_codecs((adev), (e), (c))#define amdgpu_inc_vram_lost (adev) atomic_inc(&((adev)->vram_lost_counter));
Signature · 6 lines
2.29.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amdgpu: add video decode/encode cap tables and asic callbacks
For each asic family. Will be used to populate tables for the new INFO ioctl query.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 70 ++++++++++ drivers/gpu/drm/amd/amdgpu/nv.c | 162 ++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/si.c | 104 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/soc15.c | 208 +++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/vi.c | 175 ++++++++++++++++++++++++ 5 files changed, 719 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +70 -0
@@ -70,6 +70,75 @@#include "amdgpu_amdkfd.h" #include "dce_virtual.h" +static const struct amdgpu_video_codec_info cik_video_codecs_encode_array[] = +{ + { + .codec_type =AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC , + .max_width =2048 , + .max_height =1152 , + .max_level =0 , + }, +}; + +static const struct amdgpu_video_codecs cik_video_codecs_encode = +{ + .codec_count =ARRAY_SIZE (cik_video_codecs_encode_array), + .codec_array = cik_video_codecs_encode_array, +}; + +static const struct amdgpu_video_codec_info cik_video_codecs_decode_array[] = +{ + { + .codec_type =AMDGPU_VIDEO_CODEC_TYPE_MPEG2 , + .max_width =2048 , + .max_height =1152 , + .max_level =3 , + }, + { + .codec_type =AMDGPU_VIDEO_CODEC_TYPE_MPEG4 , + .max_width =2048 , + .max_height =1152 , + .max_level =5 , + }, + { + .codec_type =AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC , + .max_width =2048 , + .max_height =1152 , + .max_level =41 , + }, + { + .codec_type =AMDGPU_VIDEO_CODEC_TYPE_VC1 , + .max_width =2048 , + .max_height =1152 , + .max_level =4 , + }, +}; + +static const struct amdgpu_video_codecs cik_video_codecs_decode = +{ + .codec_count =ARRAY_SIZE (cik_video_codecs_decode_array), + .codec_array = cik_video_codecs_decode_array, +}; + +static int cik_query_video_codecs (struct amdgpu_device *adev,bool encode, +const struct amdgpu_video_codecs **codecs) +{ +switch (adev->asic_type) { +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KAVERI : +case CHIP_KABINI : +case CHIP_MULLINS : +if (encode) + *codecs = &cik_video_codecs_encode; +else + *codecs = &cik_video_codecs_decode; +return 0 ; +default : +return -EINVAL ; + } +} +/* * Indirect registers accessor */
@@ -1944,6 +2013,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs = .get_pcie_replay_count = &cik_get_pcie_replay_count, .supports_baco = &cik_asic_supports_baco, .pre_asic_init = &cik_pre_asic_init, + .query_video_codecs = &cik_query_video_codecs, };static int cik_common_early_init (void *handle)
drivers/gpu/drm/amd/amdgpu/nv.c +162 -0
174 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/si.c +104 -0
116 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/soc15.c +208 -0
226 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vi.c +175 -0
187 lines not on this page · raw message
Signature · 6 lines
2.29.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amdgpu: add INFO ioctl support for querying video caps
In reply to Alex DeucherWe currently hardcode these in mesa, but querying them from the kernel makes more sense since there may be board specific limitations that the kernel driver is better suited to determining.
Userpace patches that use this interface:
https://gitlab.freedesktop.org/leoliu/drm/-/commits/info_video_caps
https://gitlab.freedesktop.org/leoliu/mesa/-/commits/info_video_caps
v2: reorder the codecs to better align with mesa
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 55 +++++++++++++++++++++++++ include/uapi/drm/amdgpu_drm.h | 32 ++++++++++++++ 2 files changed, 87 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +55 -0
@@ -983,6 +983,61 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) min_t(u64, size, sizeof(ras_mask))) ? -EFAULT :0 ; } +case AMDGPU_INFO_VIDEO_CAPS : { +const struct amdgpu_video_codecs *codecs; +struct drm_amdgpu_info_video_caps *caps; +int r; + + caps =kzalloc (sizeof (*caps),GFP_KERNEL ); +if (!caps) +return -ENOMEM ; + +switch (info->video_cap.type) { +case AMDGPU_INFO_VIDEO_CAPS_DECODE : + r =amdgpu_asic_query_video_codecs (adev, false, &codecs); +if (r) +return -EINVAL ; +break ; +case AMDGPU_INFO_VIDEO_CAPS_ENCODE : + r =amdgpu_asic_query_video_codecs (adev, true, &codecs); +if (r) +return -EINVAL ; +break ; +break ; +default : +DRM_DEBUG_KMS ("Invalid request %d\n" , + info->video_cap.type); +return -EINVAL ; + } +for (i =0 ; i < codecs->codec_count; i++) { +int idx = codecs->codec_array[i].codec_type; + +switch (idx) { +case AMDGPU_VIDEO_CODEC_TYPE_MPEG2 : +case AMDGPU_VIDEO_CODEC_TYPE_MPEG4 : +case AMDGPU_VIDEO_CODEC_TYPE_MPEG4_AVC : +case AMDGPU_VIDEO_CODEC_TYPE_VC1 : +case AMDGPU_VIDEO_CODEC_TYPE_HEVC : +case AMDGPU_VIDEO_CODEC_TYPE_JPEG : +case AMDGPU_VIDEO_CODEC_TYPE_VP9 : +case AMDGPU_VIDEO_CODEC_TYPE_AV1 : + caps->codec_info[idx].valid =1 ; + caps->codec_info[idx].max_width = + codecs->codec_array[i].max_width; + caps->codec_info[idx].max_height = + codecs->codec_array[i].max_height; + caps->codec_info[idx].max_level = + codecs->codec_array[i].max_level; +break ; +default : +break ; + } + } + r =copy_to_user (out, caps, +min ((size_t )size,sizeof (*caps))) ? -EFAULT :0 ; +kfree (caps); +return r; + }default :DRM_DEBUG_KMS ("Invalid request %d\n" , info->query);return -EINVAL ;
include/uapi/drm/amdgpu_drm.h +32 -0
@@ -782,6 +782,12 @@ struct drm_amdgpu_cs_chunk_data {#define AMDGPU_INFO_VRAM_LOST_COUNTER 0x1F/* query ras mask of enabled features*/ #define AMDGPU_INFO_RAS_ENABLED_FEATURES 0x20 +/* query video encode/decode caps */ +#define AMDGPU_INFO_VIDEO_CAPS 0x21 +/* Subquery id: Decode */ +#define AMDGPU_INFO_VIDEO_CAPS_DECODE 0 +/* Subquery id: Encode */ +#define AMDGPU_INFO_VIDEO_CAPS_ENCODE 1/* RAS MASK: UMC (VRAM) */ #define AMDGPU_INFO_RAS_ENABLED_UMC (1 << 0)
@@ -878,6 +884,10 @@ struct drm_amdgpu_info {struct {__u32 type; } sensor_info; + +struct { +__u32 type; + } video_cap; }; };
@@ -1074,6 +1084,28 @@ struct drm_amdgpu_info_vce_clock_table {__u32 pad; }; +/* query video encode/decode caps */ +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 0 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 1 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1 2 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC 3 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC 4 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG 5 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9 6 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1 7 +#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT 8 + +struct drm_amdgpu_info_video_codec_info { +__u32 valid; +__u32 max_width; +__u32 max_height; +__u32 max_level; +}; + +struct drm_amdgpu_info_video_caps { +struct drm_amdgpu_info_video_codec_info codec_info[AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT ]; +}; +/* * Supported GPU families */
Signature · 6 lines
2.29.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amdgpu: bump driver version for new video codec INFO ioctl query
In reply to Alex DeucherSo mesa can check when to query the kernel vs use hardcoded codec bandwidth data.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -90,9 +90,10 @@* - 3.38.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC * - 3.39.0 - DMABUF implicit sync does a full pipeline sync * - 3.40.0 - Add AMDGPU_IDS_FLAGS_TMZ +* - 3.41.0 - Add video codec query */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 40 +#define KMS_DRIVER_MINOR 41#define KMS_DRIVER_PATCHLEVEL 0int amdgpu_vram_limit;
Signature · 6 lines
2.29.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 4/4] drm/amdgpu: bump driver version for new video codec INFO ioctl query
[AMD Official Use Only - Internal Distribution Only]
The series are:
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: January 27, 2021 12:33 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 4/4] drm/amdgpu: bump driver version for new video codec INFO ioctl query
So mesa can check when to query the kernel vs use hardcoded codec bandwidth data.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -90,9 +90,10 @@* - 3.38.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC * - 3.39.0 - DMABUF implicit sync does a full pipeline sync * - 3.40.0 - Add AMDGPU_IDS_FLAGS_TMZ +* - 3.41.0 - Add video codec query */ #define KMS_DRIVER_MAJOR3 -#define KMS_DRIVER_MINOR40 +#define KMS_DRIVER_MINOR41 #define KMS_DRIVER_PATCHLEVEL0 int amdgpu_vram_limit;
--
2.29.2
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cleo.liu%40amd.com%7Cb5fda388b89a4295995e08d8c284fd6b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637473223735530829%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=8IC5CmO10YRja0spv4lRMyeCR8eaWgLsDjpy7cZTHMI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx