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

2021-10-01 Thread Christian König 

It means that you should modify your patch, yes.

Regards,
Christian.

Am 01.10.21 um 05:02 schrieb 郭正奎:


So, it means I need to make another commit?

Zhengkui

*From:*guozheng...@vivo.com  *On Behalf Of 
*Christian K?nig

*Sent:* Thursday, September 30, 2021 7:56 PM
*To:* Guo Zhengkui ; Simon Ser 
*Cc:* Deucher, Alexander ; Pan, Xinhui 
; David Airlie ; Daniel Vetter 
; Chen, Guchun ; Zhou, Peng Ju 
; Zhang, Bokun ; Gao, Likun 
; amd-gfx@lists.freedesktop.org; 
dri-de...@lists.freedesktop.org; linux-ker...@vger.kernel.org; kernel 


*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] = {

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

2021-10-01 Thread 郭正奎 
So, it means I need to make another commit?

Zhengkui
From: guozheng...@vivo.com  On Behalf Of Christian K?nig
Sent: Thursday, September 30, 2021 7:56 PM
To: Guo Zhengkui ; Simon Ser 
Cc: Deucher, Alexander ; Pan, Xinhui 
; David Airlie ; Daniel Vetter 
; Chen, Guchun ; Zhou, Peng Ju 
; Zhang, Bokun ; Gao, Likun 
; amd-gfx@lists.freedesktop.org; 
dri-de...@lists.freedesktop.org; linux-ker...@vger.kernel.org; kernel 

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] = {

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

2021-09-30 Thread 郭正奎 
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] = {

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

2021-09-30 Thread Christian König 
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] = {

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

2021-09-30 Thread Simon Ser 
One include is v2, the other is v3, or am I missing something?