<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> It means that you should modify your patch, yes. Regards, Christian. <div class="moz-cite-prefix">Am 01.10.21 um 05:02 schrieb 郭正奎: </div> <blockquote type="cite" cite="mid:HK2PR06MB34925517684D29A3A65F7004C7AB9@HK2PR06MB3492.apcprd06.prod.outlook.com"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style>@font-face {font-family:宋体; panose-1:2 1 6 0 3 1 1 1 1 1;}@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:Calibri; panose-1:2 15 5 2 2 2 4 3 2 4;}@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";}@font-face {font-family:"\@宋体"; panose-1:2 1 6 0 3 1 1 1 1 1;}p.MsoNormal, li.MsoNormal, div.MsoNormal {margin: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"> So, it means I need to make another commit?<o:p></o:p> <o:p> </o:p> Zhengkui<o:p></o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm"> From: <a class="moz-txt-link-abbreviated" href="mailto:guozhengkui@vivo.com">guozhengkui@vivo.com</a> <a class="moz-txt-link-rfc2396E" href="mailto:guozhengkui@vivo.com"><guozhengkui@vivo.com></a> On Behalf Of Christian K?nig Sent: Thursday, September 30, 2021 7:56 PM To: Guo Zhengkui <a class="moz-txt-link-rfc2396E" href="mailto:guozhengkui@vivo.com"><guozhengkui@vivo.com></a>; Simon Ser <a class="moz-txt-link-rfc2396E" href="mailto:contact@emersion.fr"><contact@emersion.fr></a> Cc: Deucher, Alexander <a class="moz-txt-link-rfc2396E" href="mailto:Alexander.Deucher@amd.com"><Alexander.Deucher@amd.com></a>; Pan, Xinhui <a class="moz-txt-link-rfc2396E" href="mailto:Xinhui.Pan@amd.com"><Xinhui.Pan@amd.com></a>; David Airlie <a class="moz-txt-link-rfc2396E" href="mailto:airlied@linux.ie"><airlied@linux.ie></a>; Daniel Vetter <a class="moz-txt-link-rfc2396E" href="mailto:daniel@ffwll.ch"><daniel@ffwll.ch></a>; Chen, Guchun <a class="moz-txt-link-rfc2396E" href="mailto:Guchun.Chen@amd.com"><Guchun.Chen@amd.com></a>; Zhou, Peng Ju <a class="moz-txt-link-rfc2396E" href="mailto:PengJu.Zhou@amd.com"><PengJu.Zhou@amd.com></a>; Zhang, Bokun <a class="moz-txt-link-rfc2396E" href="mailto:Bokun.Zhang@amd.com"><Bokun.Zhang@amd.com></a>; Gao, Likun <a class="moz-txt-link-rfc2396E" href="mailto:Likun.Gao@amd.com"><Likun.Gao@amd.com></a>; <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a>; <a class="moz-txt-link-abbreviated" href="mailto:dri-devel@lists.freedesktop.org">dri-devel@lists.freedesktop.org</a>; <a class="moz-txt-link-abbreviated" href="mailto:linux-kernel@vger.kernel.org">linux-kernel@vger.kernel.org</a>; kernel <a class="moz-txt-link-rfc2396E" href="mailto:kernel@vivo.com"><kernel@vivo.com></a> Subject: Re: [PATCH] drm/amdgpu: fix some repeated includings<o:p></o:p> </div> </div> <o:p> </o:p> 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.<o:p></o:p> <div> Am 30.09.21 um 13:54 schrieb 郭正奎:<o:p></o:p> </div> <blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"> 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> </blockquote> <o:p> </o:p> </div> </blockquote> </body> </html>