|
48 | 48 | static const struct amd_ip_funcs soc21_common_ip_funcs;
|
49 | 49 |
|
50 | 50 | /* SOC21 */
|
51 |
| -static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_encode_array_vcn0[] = |
52 |
| -{ |
| 51 | +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_encode_array_vcn0[] = { |
53 | 52 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 2304, 0)},
|
54 | 53 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 2304, 0)},
|
55 | 54 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1, 8192, 4352, 0)},
|
56 | 55 | };
|
57 | 56 |
|
58 |
| -static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_encode_array_vcn1[] = |
59 |
| -{ |
| 57 | +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_encode_array_vcn1[] = { |
60 | 58 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 2304, 0)},
|
61 | 59 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 2304, 0)},
|
62 | 60 | };
|
63 | 61 |
|
64 |
| -static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode_vcn0 = |
65 |
| -{ |
| 62 | +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode_vcn0 = { |
66 | 63 | .codec_count = ARRAY_SIZE(vcn_4_0_0_video_codecs_encode_array_vcn0),
|
67 | 64 | .codec_array = vcn_4_0_0_video_codecs_encode_array_vcn0,
|
68 | 65 | };
|
69 | 66 |
|
70 |
| -static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode_vcn1 = |
71 |
| -{ |
| 67 | +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_encode_vcn1 = { |
72 | 68 | .codec_count = ARRAY_SIZE(vcn_4_0_0_video_codecs_encode_array_vcn1),
|
73 | 69 | .codec_array = vcn_4_0_0_video_codecs_encode_array_vcn1,
|
74 | 70 | };
|
75 | 71 |
|
76 |
| -static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array_vcn0[] = |
77 |
| -{ |
| 72 | +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array_vcn0[] = { |
78 | 73 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4096, 52)},
|
79 | 74 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},
|
80 | 75 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},
|
81 | 76 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},
|
82 | 77 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1, 8192, 4352, 0)},
|
83 | 78 | };
|
84 | 79 |
|
85 |
| -static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array_vcn1[] = |
86 |
| -{ |
| 80 | +static const struct amdgpu_video_codec_info vcn_4_0_0_video_codecs_decode_array_vcn1[] = { |
87 | 81 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4096, 52)},
|
88 | 82 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},
|
89 | 83 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},
|
90 | 84 | {codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},
|
91 | 85 | };
|
92 | 86 |
|
93 |
| -static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_decode_vcn0 = |
94 |
| -{ |
| 87 | +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_decode_vcn0 = { |
95 | 88 | .codec_count = ARRAY_SIZE(vcn_4_0_0_video_codecs_decode_array_vcn0),
|
96 | 89 | .codec_array = vcn_4_0_0_video_codecs_decode_array_vcn0,
|
97 | 90 | };
|
98 | 91 |
|
99 |
| -static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_decode_vcn1 = |
100 |
| -{ |
| 92 | +static const struct amdgpu_video_codecs vcn_4_0_0_video_codecs_decode_vcn1 = { |
101 | 93 | .codec_count = ARRAY_SIZE(vcn_4_0_0_video_codecs_decode_array_vcn1),
|
102 | 94 | .codec_array = vcn_4_0_0_video_codecs_decode_array_vcn1,
|
103 | 95 | };
|
@@ -445,8 +437,7 @@ static void soc21_program_aspm(struct amdgpu_device *adev)
|
445 | 437 | adev->nbio.funcs->program_aspm(adev);
|
446 | 438 | }
|
447 | 439 |
|
448 |
| -const struct amdgpu_ip_block_version soc21_common_ip_block = |
449 |
| -{ |
| 440 | +const struct amdgpu_ip_block_version soc21_common_ip_block = { |
450 | 441 | .type = AMD_IP_BLOCK_TYPE_COMMON,
|
451 | 442 | .major = 1,
|
452 | 443 | .minor = 0,
|
@@ -537,8 +528,7 @@ static int soc21_update_umd_stable_pstate(struct amdgpu_device *adev,
|
537 | 528 | return 0;
|
538 | 529 | }
|
539 | 530 |
|
540 |
| -static const struct amdgpu_asic_funcs soc21_asic_funcs = |
541 |
| -{ |
| 531 | +static const struct amdgpu_asic_funcs soc21_asic_funcs = { |
542 | 532 | .read_disabled_bios = &soc21_read_disabled_bios,
|
543 | 533 | .read_bios_from_rom = &amdgpu_soc15_read_bios_from_rom,
|
544 | 534 | .read_register = &soc21_read_register,
|
|
0 commit comments