RE: [PATCH] drm/amdgpu: fix some repeated includings

[郭正奎 <guozhengkui@xxxxxxxx>]

So, it means I need to make another commit?

 

Zhengkui

From: guozhengkui@xxxxxxxx <guozhengkui@xxxxxxxx> On Behalf Of Christian K?nig
Sent: Thursday, September 30, 2021 7:56 PM
To: Guo Zhengkui <guozhengkui@xxxxxxxx>; Simon Ser <contact@xxxxxxxxxxx>
Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Pan, Xinhui <Xinhui.Pan@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>; Chen, Guchun <Guchun.Chen@xxxxxxx>; Zhou, Peng Ju <PengJu.Zhou@xxxxxxx>; Zhang, Bokun <Bokun.Zhang@xxxxxxx>; Gao, Likun <Likun.Gao@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; kernel <kernel@xxxxxxxx>
Subject: Re: [PATCH] drm/amdgpu: fix some repeated includings

 

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.

Am 30.09.21 um 13:54 schrieb 郭正奎:

Actually the duplicates take place in line 46, 47 and 62, 63.

 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

index 291a47f7992a..94fca56583a0 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

@@ -46,34 +46,32 @@

#include "vcn_v2_0.h"

#include "jpeg_v2_0.h"

#include "vcn_v2_5.h"

#include "jpeg_v2_5.h"

#include "smuio_v9_0.h"

#include "gmc_v10_0.h"

#include "gfxhub_v2_0.h"

#include "mmhub_v2_0.h"

#include "nbio_v2_3.h"

#include "nbio_v7_2.h"

#include "hdp_v5_0.h"

#include "nv.h"

#include "navi10_ih.h"

#include "gfx_v10_0.h"

#include "sdma_v5_0.h"

#include "sdma_v5_2.h"

-#include "vcn_v2_0.h"

-#include "jpeg_v2_0.h"

#include "vcn_v3_0.h"

#include "jpeg_v3_0.h"

#include "amdgpu_vkms.h"

#include "mes_v10_1.h"

#include "smuio_v11_0.h"

#include "smuio_v11_0_6.h"

#include "smuio_v13_0.h"

 

MODULE_FIRMWARE("amdgpu/ip_discovery.bin");

 

#define mmRCC_CONFIG_MEMSIZE   0xde3

#define mmMM_INDEX             0x0

#define mmMM_INDEX_HI          0x6

#define mmMM_DATA              0x1

 

static const char *hw_id_names[HW_ID_MAX] = {