2022-08-15 20:16:24

by Dong, Ruijing

[permalink] [raw]
Subject: RE: [PATCH linux-next] drm/amdgpu/vcn: Return void from the stop_dbg_mode

[AMD Official Use Only - General]

This patch is

Reviewed-by: Ruijing Dong <[email protected]>

Thanks,
Ruijing

-----Original Message-----
From: Khalid Masum <[email protected]>
Sent: Monday, August 15, 2022 2:34 PM
To: Dong, Ruijing <[email protected]>; [email protected]; [email protected]; [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Zhu, James <[email protected]>; Liu, Leo <[email protected]>; Jiang, Sonny <[email protected]>; Wan Jiabing <[email protected]>; Greg Kroah-Hartman <[email protected]>; Khalid Masum <[email protected]>
Subject: [PATCH linux-next] drm/amdgpu/vcn: Return void from the stop_dbg_mode

There is no point in returning an int here. It only returns 0 which the caller never uses. Therefore return void and remove the unnecessary assignment.

Addresses-Coverity: 1504988 ("Unused value")
Fixes: 8da1170a16e4 ("drm/amdgpu: add VCN4 ip block support")
Suggested-by: Ruijing Dong <[email protected]>
Suggested-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Khalid Masum <[email protected]>
---
Past discussions:
- V1 Link: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2F20220815070056.10816-1-khalid.masum.92%40gmail.com%2F&amp;data=05%7C01%7Cruijing.dong%40amd.com%7C017222a9e81f49ea336f08da7eecd6c8%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637961852950464412%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=TyXtoF2flWNqabtiJ%2BDVcR2vdsnLZ19qr3b%2BQT2DBQA%3D&amp;reserved=0

Changes since V1:
- Make stop_dbg_mode return void
- Update commit description

drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index ca14c3ef742e..fb2d74f30448 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -1115,7 +1115,7 @@ static int vcn_v4_0_start(struct amdgpu_device *adev)
*
* Stop VCN block with dpg mode
*/
-static int vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int inst_idx)
+static void vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int
+inst_idx)
{
uint32_t tmp;

@@ -1133,7 +1133,6 @@ static int vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int inst_idx)
/* disable dynamic power gating mode */
WREG32_P(SOC15_REG_OFFSET(VCN, inst_idx, regUVD_POWER_STATUS), 0,
~UVD_POWER_STATUS__UVD_PG_MODE_MASK);
- return 0;
}

/**
@@ -1154,7 +1153,7 @@ static int vcn_v4_0_stop(struct amdgpu_device *adev)
fw_shared->sq.queue_mode |= FW_QUEUE_DPG_HOLD_OFF;

if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) {
- r = vcn_v4_0_stop_dpg_mode(adev, i);
+ vcn_v4_0_stop_dpg_mode(adev, i);
continue;
}

--
2.37.1


2022-08-16 05:27:04

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH linux-next] drm/amdgpu/vcn: Return void from the stop_dbg_mode

Applied. Thanks!

Alex

On Mon, Aug 15, 2022 at 2:40 PM Dong, Ruijing <[email protected]> wrote:
>
> [AMD Official Use Only - General]
>
> This patch is
>
> Reviewed-by: Ruijing Dong <[email protected]>
>
> Thanks,
> Ruijing
>
> -----Original Message-----
> From: Khalid Masum <[email protected]>
> Sent: Monday, August 15, 2022 2:34 PM
> To: Dong, Ruijing <[email protected]>; [email protected]; [email protected]; [email protected]
> Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Zhu, James <[email protected]>; Liu, Leo <[email protected]>; Jiang, Sonny <[email protected]>; Wan Jiabing <[email protected]>; Greg Kroah-Hartman <[email protected]>; Khalid Masum <[email protected]>
> Subject: [PATCH linux-next] drm/amdgpu/vcn: Return void from the stop_dbg_mode
>
> There is no point in returning an int here. It only returns 0 which the caller never uses. Therefore return void and remove the unnecessary assignment.
>
> Addresses-Coverity: 1504988 ("Unused value")
> Fixes: 8da1170a16e4 ("drm/amdgpu: add VCN4 ip block support")
> Suggested-by: Ruijing Dong <[email protected]>
> Suggested-by: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Khalid Masum <[email protected]>
> ---
> Past discussions:
> - V1 Link: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2F20220815070056.10816-1-khalid.masum.92%40gmail.com%2F&amp;data=05%7C01%7Cruijing.dong%40amd.com%7C017222a9e81f49ea336f08da7eecd6c8%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637961852950464412%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=TyXtoF2flWNqabtiJ%2BDVcR2vdsnLZ19qr3b%2BQT2DBQA%3D&amp;reserved=0
>
> Changes since V1:
> - Make stop_dbg_mode return void
> - Update commit description
>
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index ca14c3ef742e..fb2d74f30448 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -1115,7 +1115,7 @@ static int vcn_v4_0_start(struct amdgpu_device *adev)
> *
> * Stop VCN block with dpg mode
> */
> -static int vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int inst_idx)
> +static void vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int
> +inst_idx)
> {
> uint32_t tmp;
>
> @@ -1133,7 +1133,6 @@ static int vcn_v4_0_stop_dpg_mode(struct amdgpu_device *adev, int inst_idx)
> /* disable dynamic power gating mode */
> WREG32_P(SOC15_REG_OFFSET(VCN, inst_idx, regUVD_POWER_STATUS), 0,
> ~UVD_POWER_STATUS__UVD_PG_MODE_MASK);
> - return 0;
> }
>
> /**
> @@ -1154,7 +1153,7 @@ static int vcn_v4_0_stop(struct amdgpu_device *adev)
> fw_shared->sq.queue_mode |= FW_QUEUE_DPG_HOLD_OFF;
>
> if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) {
> - r = vcn_v4_0_stop_dpg_mode(adev, i);
> + vcn_v4_0_stop_dpg_mode(adev, i);
> continue;
> }
>
> --
> 2.37.1
>