[PATCH] drm/amdgpu: fix some repeated includings

[PATCH] drm/amdgpu: fix some repeated includings

[Guo Zhengkui]

Remove two repeated includings in line 62 and 63.

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 --
 1 file changed, 2 deletions(-)

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
@@ -59,8 +59,6 @@
 #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"
-- 
2.20.1

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

[Simon Ser]

One include is v2, the other is v3, or am I missing something?

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

[Koenig, Christian]

[-- Attachment #1: Type: text/plain, Size: 959 bytes --]

Seconded, there is one include for each hardware version.

At least of hand I don't see a duplicate.
________________________________
Von: Simon Ser <contact@emersion.fr>
Gesendet: Donnerstag, 30. September 2021 12:17
An: Guo Zhengkui <guozhengkui@vivo.com>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; Chen, Guchun <Guchun.Chen@amd.com>; Zhou, Peng Ju <PengJu.Zhou@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>; Gao, Likun <Likun.Gao@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>; kernel@vivo.com <kernel@vivo.com>
Betreff: Re: [PATCH] drm/amdgpu: fix some repeated includings

One include is v2, the other is v3, or am I missing something?

[-- Attachment #2: Type: text/html, Size: 1559 bytes --]

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

[郭正奎]

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]

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

[-- Attachment #2: Type: text/html, Size: 9081 bytes --]

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

[Christian König]

[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]

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


[-- Attachment #2: Type: text/html, Size: 9513 bytes --]

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

[郭正奎]

[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]

So, it means I need to make another commit?

Zhengkui
From: guozhengkui@vivo.com <guozhengkui@vivo.com> On Behalf Of Christian K?nig
Sent: Thursday, September 30, 2021 7:56 PM
To: Guo Zhengkui <guozhengkui@vivo.com>; Simon Ser <contact@emersion.fr>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; Chen, Guchun <Guchun.Chen@amd.com>; Zhou, Peng Ju <PengJu.Zhou@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>; Gao, Likun <Likun.Gao@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; kernel <kernel@vivo.com>
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] = {


[-- Attachment #2: Type: text/html, Size: 12348 bytes --]

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

[Christian König]

[-- Attachment #1: Type: text/plain, Size: 2603 bytes --]

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:*guozhengkui@vivo.com <guozhengkui@vivo.com> *On Behalf Of 
> *Christian K?nig
> *Sent:* Thursday, September 30, 2021 7:56 PM
> *To:* Guo Zhengkui <guozhengkui@vivo.com>; Simon Ser <contact@emersion.fr>
> *Cc:* Deucher, Alexander <Alexander.Deucher@amd.com>; Pan, Xinhui 
> <Xinhui.Pan@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter 
> <daniel@ffwll.ch>; Chen, Guchun <Guchun.Chen@amd.com>; Zhou, Peng Ju 
> <PengJu.Zhou@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>; Gao, Likun 
> <Likun.Gao@amd.com>; amd-gfx@lists.freedesktop.org; 
> dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; kernel 
> <kernel@vivo.com>
> *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] = {
>


[-- Attachment #2: Type: text/html, Size: 15761 bytes --]