<html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> Ah, that makes more sense. Then please remove the duplicates in lines 46 and 47 instead since the other ones are more correctly grouped together with their blocks. Christian. <div class="moz-cite-prefix">Am 30.09.21 um 13:54 schrieb 郭正奎: </div> <blockquote type="cite" cite="mid:HK2PR06MB34922067627E3951C991B678C7AA9@HK2PR06MB3492.apcprd06.prod.outlook.com"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style>@font-face {font-family:"Cambria Math"; panose-1:2 4 5 3 5 4 6 3 2 4;}@font-face {font-family:等线; panose-1:2 1 6 0 3 1 1 1 1 1;}@font-face {font-family:"MS PGothic"; panose-1:2 11 6 0 7 2 5 8 2 4;}@font-face {font-family:"\@等线"; panose-1:2 1 6 0 3 1 1 1 1 1;}@font-face {font-family:"\@MS PGothic";}p.MsoNormal, li.MsoNormal, div.MsoNormal {margin:0cm; margin-bottom:.0001pt; font-size:12.0pt; font-family:"MS PGothic",sans-serif; mso-fareast-language:JA;}a:link, span.MsoHyperlink {mso-style-priority:99; color:#0563C1; text-decoration:underline;}a:visited, span.MsoHyperlinkFollowed {mso-style-priority:99; color:#954F72; text-decoration:underline;}p.msonormal0, li.msonormal0, div.msonormal0 {mso-style-name:msonormal; mso-margin-top-alt:auto; margin-right:0cm; mso-margin-bottom-alt:auto; margin-left:0cm; font-size:12.0pt; font-family:"MS PGothic",sans-serif; mso-fareast-language:JA;}span.EmailStyle19 {mso-style-type:personal-reply; font-family:等线; color:windowtext;}.MsoChpDefault {mso-style-type:export-only; font-size:10.0pt;}div.WordSection1 {page:WordSection1;}</style> <div class="WordSection1"> Actually the duplicates take place in line 46, 47 and 62, 63.<o:p></o:p> <o:p> </o:p> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<o:p></o:p> index 291a47f7992a..94fca56583a0 100644<o:p></o:p> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<o:p></o:p> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<o:p></o:p> @@ -46,34 +46,32 @@<o:p></o:p> #include "vcn_v2_0.h"<o:p></o:p> #include "jpeg_v2_0.h"<o:p></o:p> #include "vcn_v2_5.h"<o:p></o:p> #include "jpeg_v2_5.h"<o:p></o:p> #include "smuio_v9_0.h"<o:p></o:p> #include "gmc_v10_0.h"<o:p></o:p> #include "gfxhub_v2_0.h"<o:p></o:p> #include "mmhub_v2_0.h"<o:p></o:p> #include "nbio_v2_3.h"<o:p></o:p> #include "nbio_v7_2.h"<o:p></o:p> #include "hdp_v5_0.h"<o:p></o:p> #include "nv.h"<o:p></o:p> #include "navi10_ih.h"<o:p></o:p> #include "gfx_v10_0.h"<o:p></o:p> #include "sdma_v5_0.h"<o:p></o:p> #include "sdma_v5_2.h"<o:p></o:p> -#include "vcn_v2_0.h"<o:p></o:p> -#include "jpeg_v2_0.h"<o:p></o:p> #include "vcn_v3_0.h"<o:p></o:p> #include "jpeg_v3_0.h"<o:p></o:p> #include "amdgpu_vkms.h"<o:p></o:p> #include "mes_v10_1.h"<o:p></o:p> #include "smuio_v11_0.h"<o:p></o:p> #include "smuio_v11_0_6.h"<o:p></o:p> #include "smuio_v13_0.h"<o:p></o:p> <o:p> </o:p> MODULE_FIRMWARE("amdgpu/ip_discovery.bin");<o:p></o:p> <o:p> </o:p> #define mmRCC_CONFIG_MEMSIZE 0xde3<o:p></o:p> #define mmMM_INDEX 0x0<o:p></o:p> #define mmMM_INDEX_HI 0x6<o:p></o:p> #define mmMM_DATA 0x1<o:p></o:p> <o:p> </o:p> static const char *hw_id_names[HW_ID_MAX] = {<o:p></o:p> </div> </blockquote> </body> </html>