* [PATCH] drm/amdgpu: clean up some inconsistent indenting
@ 2023-09-01 7:02 Jiapeng Chong
2023-09-01 7:30 ` Christian König
0 siblings, 1 reply; 7+ messages in thread
From: Jiapeng Chong @ 2023-09-01 7:02 UTC (permalink / raw)
To: christian.koenig
Cc: Xinhui.Pan, airlied, daniel, amd-gfx, dri-devel, linux-kernel,
Jiapeng Chong, Abaci Robot
No functional modification involved.
drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c:34 nbio_v7_11_get_rev_id() warn: inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6316
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
index 7c08e5f95e97..76e21357dd4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
@@ -31,10 +31,9 @@
static u32 nbio_v7_11_get_rev_id(struct amdgpu_device *adev)
{
u32 tmp;
- printk("%s, getid\n",__func__);
-
- tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
+ printk("%s, getid\n", __func__);
+ tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
tmp &= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdgpu: clean up some inconsistent indenting
2023-09-01 7:02 [PATCH] drm/amdgpu: clean up some inconsistent indenting Jiapeng Chong
@ 2023-09-01 7:30 ` Christian König
2023-09-05 17:20 ` Alex Deucher
0 siblings, 1 reply; 7+ messages in thread
From: Christian König @ 2023-09-01 7:30 UTC (permalink / raw)
To: Jiapeng Chong
Cc: Xinhui.Pan, airlied, daniel, amd-gfx, dri-devel, linux-kernel,
Abaci Robot
Am 01.09.23 um 09:02 schrieb Jiapeng Chong:
> No functional modification involved.
>
> drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c:34 nbio_v7_11_get_rev_id() warn: inconsistent indenting.
We should probably not have a printk here in the first place.
Christian.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6316
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> index 7c08e5f95e97..76e21357dd4d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> @@ -31,10 +31,9 @@
> static u32 nbio_v7_11_get_rev_id(struct amdgpu_device *adev)
> {
> u32 tmp;
> - printk("%s, getid\n",__func__);
> -
> - tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
>
> + printk("%s, getid\n", __func__);
> + tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
> tmp &= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
> tmp >>= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdgpu: clean up some inconsistent indenting
2023-09-01 7:30 ` Christian König
@ 2023-09-05 17:20 ` Alex Deucher
0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2023-09-05 17:20 UTC (permalink / raw)
To: Christian König
Cc: Jiapeng Chong, Xinhui.Pan, Abaci Robot, linux-kernel, dri-devel, amd-gfx
Applied and dropped the printk.
Alex
On Fri, Sep 1, 2023 at 3:40 AM Christian König <christian.koenig@amd.com> wrote:
>
> Am 01.09.23 um 09:02 schrieb Jiapeng Chong:
> > No functional modification involved.
> >
> > drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c:34 nbio_v7_11_get_rev_id() warn: inconsistent indenting.
>
>
> We should probably not have a printk here in the first place.
>
> Christian.
>
> >
> > Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6316
> > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> > index 7c08e5f95e97..76e21357dd4d 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
> > @@ -31,10 +31,9 @@
> > static u32 nbio_v7_11_get_rev_id(struct amdgpu_device *adev)
> > {
> > u32 tmp;
> > - printk("%s, getid\n",__func__);
> > -
> > - tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
> >
> > + printk("%s, getid\n", __func__);
> > + tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP1_RCC_DEV0_EPF0_STRAP0);
> > tmp &= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
> > tmp >>= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdgpu: clean up some inconsistent indenting
@ 2023-06-02 6:16 Jiapeng Chong
2023-06-02 13:16 ` Alex Deucher
0 siblings, 1 reply; 7+ messages in thread
From: Jiapeng Chong @ 2023-06-02 6:16 UTC (permalink / raw)
To: alexander.deucher
Cc: christian.koenig, Xinhui.Pan, airlied, daniel, amd-gfx,
dri-devel, linux-kernel, Jiapeng Chong, Abaci Robot
No functional modification involved.
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:614 amdgpu_gfx_enable_kcq() warn: inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5377
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index a33d4bc34cee..37a8f43cf281 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -611,8 +611,7 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id)
kiq->pmf->kiq_set_resources(kiq_ring, queue_mask);
for (i = 0; i < adev->gfx.num_compute_rings; i++) {
j = i + xcc_id * adev->gfx.num_compute_rings;
- kiq->pmf->kiq_map_queues(kiq_ring,
- &adev->gfx.compute_ring[j]);
+ kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.compute_ring[j]);
}
r = amdgpu_ring_test_helper(kiq_ring);
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdgpu: clean up some inconsistent indenting
2023-06-02 6:16 Jiapeng Chong
@ 2023-06-02 13:16 ` Alex Deucher
0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2023-06-02 13:16 UTC (permalink / raw)
To: Jiapeng Chong
Cc: alexander.deucher, Xinhui.Pan, Abaci Robot, linux-kernel,
amd-gfx, dri-devel, christian.koenig
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
On Fri, Jun 2, 2023 at 2:17 AM Jiapeng Chong
<jiapeng.chong@linux.alibaba.com> wrote:
>
> No functional modification involved.
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:614 amdgpu_gfx_enable_kcq() warn: inconsistent indenting.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5377
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index a33d4bc34cee..37a8f43cf281 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -611,8 +611,7 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id)
> kiq->pmf->kiq_set_resources(kiq_ring, queue_mask);
> for (i = 0; i < adev->gfx.num_compute_rings; i++) {
> j = i + xcc_id * adev->gfx.num_compute_rings;
> - kiq->pmf->kiq_map_queues(kiq_ring,
> - &adev->gfx.compute_ring[j]);
> + kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.compute_ring[j]);
> }
>
> r = amdgpu_ring_test_helper(kiq_ring);
> --
> 2.20.1.7.g153144c
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdgpu: clean up some inconsistent indenting
@ 2022-05-10 6:04 Jiapeng Chong
2022-05-10 15:09 ` Alex Deucher
0 siblings, 1 reply; 7+ messages in thread
From: Jiapeng Chong @ 2022-05-10 6:04 UTC (permalink / raw)
To: alexander.deucher
Cc: christian.koenig, Xinhui.Pan, airlied, daniel, amd-gfx,
dri-devel, linux-kernel, Jiapeng Chong, Abaci Robot
Eliminate the follow smatch warning:
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c:35 nbio_v7_7_get_rev_id() warn:
inconsistent indenting.
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c:214 nbio_v7_7_init_registers()
warn: inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
index e32c874b42b5..cdc0c9779848 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
@@ -32,8 +32,7 @@ static u32 nbio_v7_7_get_rev_id(struct amdgpu_device *adev)
{
u32 tmp;
- tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0);
-
+ tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0);
tmp &= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
tmp >>= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
@@ -211,14 +210,14 @@ static void nbio_v7_7_init_registers(struct amdgpu_device *adev)
{
uint32_t def, data;
- def = data = RREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3);
- data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
- CI_SWUS_MAX_READ_REQUEST_SIZE_MODE, 1);
- data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
- CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV, 1);
+ def = data = RREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3);
+ data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
+ CI_SWUS_MAX_READ_REQUEST_SIZE_MODE, 1);
+ data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
+ CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV, 1);
- if (def != data)
- WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
+ if (def != data)
+ WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
}
--
2.20.1.7.g153144c
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdgpu: clean up some inconsistent indenting
2022-05-10 6:04 Jiapeng Chong
@ 2022-05-10 15:09 ` Alex Deucher
0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2022-05-10 15:09 UTC (permalink / raw)
To: Jiapeng Chong
Cc: Deucher, Alexander, Dave Airlie, xinhui pan, Abaci Robot, LKML,
Maling list - DRI developers, amd-gfx list, Christian Koenig
Applied. Thanks!
Alex
On Tue, May 10, 2022 at 2:05 AM Jiapeng Chong
<jiapeng.chong@linux.alibaba.com> wrote:
>
> Eliminate the follow smatch warning:
>
> drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c:35 nbio_v7_7_get_rev_id() warn:
> inconsistent indenting.
>
> drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c:214 nbio_v7_7_init_registers()
> warn: inconsistent indenting.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
> index e32c874b42b5..cdc0c9779848 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
> @@ -32,8 +32,7 @@ static u32 nbio_v7_7_get_rev_id(struct amdgpu_device *adev)
> {
> u32 tmp;
>
> - tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0);
> -
> + tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0);
> tmp &= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK;
> tmp >>= RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT;
>
> @@ -211,14 +210,14 @@ static void nbio_v7_7_init_registers(struct amdgpu_device *adev)
> {
> uint32_t def, data;
>
> - def = data = RREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3);
> - data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
> - CI_SWUS_MAX_READ_REQUEST_SIZE_MODE, 1);
> - data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
> - CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV, 1);
> + def = data = RREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3);
> + data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
> + CI_SWUS_MAX_READ_REQUEST_SIZE_MODE, 1);
> + data = REG_SET_FIELD(data, BIF0_PCIE_MST_CTRL_3,
> + CI_SWUS_MAX_READ_REQUEST_SIZE_PRIV, 1);
>
> - if (def != data)
> - WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
> + if (def != data)
> + WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
>
> }
>
> --
> 2.20.1.7.g153144c
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-09-05 17:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-01 7:02 [PATCH] drm/amdgpu: clean up some inconsistent indenting Jiapeng Chong
2023-09-01 7:30 ` Christian König
2023-09-05 17:20 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2023-06-02 6:16 Jiapeng Chong
2023-06-02 13:16 ` Alex Deucher
2022-05-10 6:04 Jiapeng Chong
2022-05-10 15:09 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®