2023-01-15 08:00:16

by Deepak R Varma

[permalink] [raw]
Subject: [PATCH 0/3] drm/amd/pm/powerplay: use bitwise or for bitmasks addition

The patch series proposes usage of bitwise or "|" operator for addition of
bitmasks instead of using numerial additions. The former is quicker and cleaner.

The proposed change is compile tested.

Deepak R Varma (3):
drm/amd/pm/powerplay/smumgr: use bitwise or for addition
drm/amd/pm/powerplay/hwmgr: use bitwise or for bitmasks addition
drm/amd/pm/powerplay/smumgr/ci: use bitwise or for bitmasks addition

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++----
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 2 +-
drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +-
drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

--
2.34.1




2023-01-15 08:03:52

by Deepak R Varma

[permalink] [raw]
Subject: [PATCH 2/3] drm/amd/pm/powerplay/hwmgr: use bitwise or for bitmasks addition

For bit mask addition, it is recommended to use or operator "|" instead
of numerical addition as the former is quicker and cleaner. Change
suggested by orplus.cocci Coccinelle semantic patch.

Signed-off-by: Deepak R Varma <[email protected]>
---
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index 7ef7e81525a3..bf9bcc4e5338 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -4153,7 +4153,7 @@ static int smu7_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr)

if ((0 == data->sclk_dpm_key_disabled) &&
(data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) {
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_UPDATE_SCLK))) {
PP_ASSERT_WITH_CODE(true == smum_is_dpm_running(hwmgr),
"Trying to freeze SCLK DPM when DPM is disabled",
);
@@ -4210,7 +4210,7 @@ static int smu7_populate_and_upload_sclk_mclk_dpm_levels(
}

if (data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK)) {
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_UPDATE_SCLK)) {
result = smum_populate_all_graphic_levels(hwmgr);
PP_ASSERT_WITH_CODE((0 == result),
"Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
@@ -4218,7 +4218,7 @@ static int smu7_populate_and_upload_sclk_mclk_dpm_levels(
}

if (data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
+ (DPMTABLE_OD_UPDATE_MCLK | DPMTABLE_UPDATE_MCLK)) {
/*populate MCLK dpm table to SMU7 */
result = smum_populate_all_memory_levels(hwmgr);
PP_ASSERT_WITH_CODE((0 == result),
@@ -4309,7 +4309,7 @@ static int smu7_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr)

if ((0 == data->sclk_dpm_key_disabled) &&
(data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) {
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_UPDATE_SCLK))) {

PP_ASSERT_WITH_CODE(true == smum_is_dpm_running(hwmgr),
"Trying to Unfreeze SCLK DPM when DPM is disabled",
--
2.34.1



2023-01-15 08:05:04

by Deepak R Varma

[permalink] [raw]
Subject: [PATCH 1/3] drm/amd/pm/powerplay/smumgr: use bitwise or for addition

For bit mask addition, it is recommended to use or operator "|" instead
of numerical addition as the former is quicker and cleaner. Change
suggested by orplus.cocci Coccinelle semantic patch.

Signed-off-by: Deepak R Varma <[email protected]>
---
drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +-
drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
index 03df35dee8ba..060fc140c574 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
@@ -2165,7 +2165,7 @@ static int iceland_program_mem_timing_parameters(struct pp_hwmgr *hwmgr)
struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);

if (data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_OD_UPDATE_MCLK))
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_OD_UPDATE_MCLK))
return iceland_program_memory_timing_parameters(hwmgr);

return 0;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
index 04b561f5d932..acbe41174d7e 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
@@ -2554,7 +2554,7 @@ static int tonga_program_mem_timing_parameters(struct pp_hwmgr *hwmgr)
struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);

if (data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_OD_UPDATE_MCLK))
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_OD_UPDATE_MCLK))
return tonga_program_memory_timing_parameters(hwmgr);

return 0;
--
2.34.1



2023-01-15 08:25:09

by Deepak R Varma

[permalink] [raw]
Subject: [PATCH 3/3] drm/amd/pm/powerplay/smumgr/ci: use bitwise or for bitmasks addition

For bit mask addition, it is recommended to use or operator "|" instead
of numerical addition as the former is quicker and cleaner. Change
suggested by orplus.cocci Coccinelle semantic patch.

Signed-off-by: Deepak R Varma <[email protected]>
---
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
index 5ca3c422f7d4..a164d12b88ad 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
@@ -2203,7 +2203,7 @@ static int ci_program_mem_timing_parameters(struct pp_hwmgr *hwmgr)
struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);

if (data->need_update_smu7_dpm_table &
- (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_OD_UPDATE_MCLK))
+ (DPMTABLE_OD_UPDATE_SCLK | DPMTABLE_OD_UPDATE_MCLK))
return ci_program_memory_timing_parameters(hwmgr);

return 0;
--
2.34.1



2023-01-16 02:53:28

by Evan Quan

[permalink] [raw]
Subject: RE: [PATCH 0/3] drm/amd/pm/powerplay: use bitwise or for bitmasks addition

[AMD Official Use Only - General]

Series is reviewed-by: Evan Quan <[email protected]>

> -----Original Message-----
> From: Deepak R Varma <[email protected]>
> Sent: Sunday, January 15, 2023 3:16 PM
> To: Quan, Evan <[email protected]>; Deucher, Alexander
> <[email protected]>; Koenig, Christian
> <[email protected]>; Pan, Xinhui <[email protected]>; David
> Airlie <[email protected]>; Daniel Vetter <[email protected]>; amd-
> [email protected]; [email protected]; linux-
> [email protected]
> Cc: Saurabh Singh Sengar <[email protected]>; Praveen Kumar
> <[email protected]>
> Subject: [PATCH 0/3] drm/amd/pm/powerplay: use bitwise or for bitmasks
> addition
>
> The patch series proposes usage of bitwise or "|" operator for addition of
> bitmasks instead of using numerial additions. The former is quicker and
> cleaner.
>
> The proposed change is compile tested.
>
> Deepak R Varma (3):
> drm/amd/pm/powerplay/smumgr: use bitwise or for addition
> drm/amd/pm/powerplay/hwmgr: use bitwise or for bitmasks addition
> drm/amd/pm/powerplay/smumgr/ci: use bitwise or for bitmasks addition
>
> drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++---
> -
> drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 2 +-
> drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +-
> drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> --
> 2.34.1
>
>

2023-01-16 19:22:44

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH 0/3] drm/amd/pm/powerplay: use bitwise or for bitmasks addition

Applied. Thanks!

Alex

On Sun, Jan 15, 2023 at 9:27 PM Quan, Evan <[email protected]> wrote:
>
> [AMD Official Use Only - General]
>
> Series is reviewed-by: Evan Quan <[email protected]>
>
> > -----Original Message-----
> > From: Deepak R Varma <[email protected]>
> > Sent: Sunday, January 15, 2023 3:16 PM
> > To: Quan, Evan <[email protected]>; Deucher, Alexander
> > <[email protected]>; Koenig, Christian
> > <[email protected]>; Pan, Xinhui <[email protected]>; David
> > Airlie <[email protected]>; Daniel Vetter <[email protected]>; amd-
> > [email protected]; [email protected]; linux-
> > [email protected]
> > Cc: Saurabh Singh Sengar <[email protected]>; Praveen Kumar
> > <[email protected]>
> > Subject: [PATCH 0/3] drm/amd/pm/powerplay: use bitwise or for bitmasks
> > addition
> >
> > The patch series proposes usage of bitwise or "|" operator for addition of
> > bitmasks instead of using numerial additions. The former is quicker and
> > cleaner.
> >
> > The proposed change is compile tested.
> >
> > Deepak R Varma (3):
> > drm/amd/pm/powerplay/smumgr: use bitwise or for addition
> > drm/amd/pm/powerplay/hwmgr: use bitwise or for bitmasks addition
> > drm/amd/pm/powerplay/smumgr/ci: use bitwise or for bitmasks addition
> >
> > drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++---
> > -
> > drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 2 +-
> > drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +-
> > drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +-
> > 4 files changed, 7 insertions(+), 7 deletions(-)
> >
> > --
> > 2.34.1
> >
> >