Skip to contentSkip to conversation

drm/amd/powerplay: fix compile warning for wrong data type

PATCH In review Evan Quan 2 participants 3 messages Sep 5, 2018 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: fix compile warning for wrong data type

do_div expects the 1st argument in 64bit instead of 32bit.

Change-Id Id2032a43727e7f1fa5163333d3565354d412a561
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +4 -4
index 3efd59e984a3..6ba5f328249d 100644
@@ -1191,14 +1191,14 @@ static int vega20_set_sclk_od(
 			&(data->dpm_table.gfx_table);
 	struct vega20_single_dpm_table *golden_sclk_table =
 			&(data->golden_dpm_table.gfx_table);
-	uint32_t od_sclk;
+	uint64_t od_sclk;
 	int ret = 0;
 
 	od_sclk = golden_sclk_table->dpm_levels[golden_sclk_table->count - 1].value * value;
 	do_div(od_sclk, 100);
 	od_sclk += golden_sclk_table->dpm_levels[golden_sclk_table->count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_GFXCLK_FMAX, od_sclk);
+	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_GFXCLK_FMAX, (uint32_t)od_sclk);
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetSclkOD] failed to set od gfxclk!",
 			return ret);
@@ -1238,14 +1238,14 @@ static int vega20_set_mclk_od(
 			&(data->dpm_table.mem_table);
 	struct vega20_single_dpm_table *golden_mclk_table =
 			&(data->golden_dpm_table.mem_table);
-	uint32_t od_mclk;
+	uint64_t od_mclk;
 	int ret = 0;
 
 	od_mclk = golden_mclk_table->dpm_levels[golden_mclk_table->count - 1].value * value;
 	do_div(od_mclk, 100);
 	od_mclk += golden_mclk_table->dpm_levels[golden_mclk_table->count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX, od_mclk);
+	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX, (uint32_t)od_mclk);
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetMclkOD] failed to set od memclk!",
 			return ret);
Signature · 6 lines
2.18.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 10 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Tuesday, September 4, 2018 10:21 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: fix compile warning for wrong data type

do_div expects the 1st argument in 64bit instead of 32bit.

Do we actually need to use do_div here? If both arguments are 32 bit, can't we just use regular division?

Alex

Quoted 57 lines
Change-Id Id2032a43727e7f1fa5163333d3565354d412a561
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -3
index 3efd59e984a3..6ba5f328249d 100644
@@ -1191,14 +1191,14 @@ static int vega20_set_sclk_od(
 			&(data->dpm_table.gfx_table);
 	struct vega20_single_dpm_table *golden_sclk_table =
 			&(data->golden_dpm_table.gfx_table);
-	uint32_t od_sclk;
+	uint64_t od_sclk;
 	int ret = 0;
 
 	od_sclk = golden_sclk_table->dpm_levels[golden_sclk_table->count
- 1].value * value;
 	do_div(od_sclk, 100);
 	od_sclk += golden_sclk_table->dpm_levels[golden_sclk_table-
 >count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr,
 OD8_SETTING_GFXCLK_FMAX, od_sclk);
+	ret = vega20_od8_set_settings(hwmgr,

OD8_SETTING_GFXCLK_FMAX, (uint32_t)od_sclk);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -2
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetSclkOD] failed to set od gfxclk!",
 			return ret);
@@ -1238,14 +1238,14 @@ static int vega20_set_mclk_od(
 			&(data->dpm_table.mem_table);
 	struct vega20_single_dpm_table *golden_mclk_table =
 			&(data->golden_dpm_table.mem_table);
-	uint32_t od_mclk;
+	uint64_t od_mclk;
 	int ret = 0;
 
 	od_mclk = golden_mclk_table->dpm_levels[golden_mclk_table-
 >count - 1].value * value;
 	do_div(od_mclk, 100);
 	od_mclk += golden_mclk_table->dpm_levels[golden_mclk_table-
 >count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX,
 od_mclk);
+	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX,

(uint32_t)od_mclk);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetMclkOD] failed to set od memclk!",
 			return ret);
--

2.18.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1809D682DE297A215FA9D32FF7020-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

author
#4 lore raw
Quoted 19 lines

-----Original Message-----
From: Deucher, Alexander
Sent: 2018年9月5日 12:33
To: Quan, Evan <[email protected]>; [email protected]
Cc: Quan, Evan <[email protected]>
Subject: RE: [PATCH] drm/amd/powerplay: fix compile warning for wrong data type

Quoted 9 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Tuesday, September 4, 2018 10:21 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: fix compile warning for wrong data type

Quoted 5 lines
Quoted 1 line

do_div expects the 1st argument in 64bit instead of 32bit.

Do we actually need to use do_div here? If both arguments are 32 bit, can't we just use regular division?

[Quan, Evan] That's a good idea. Will update the patch accordingly.

Quoted 59 lines

Alex

Quoted 57 lines
Change-Id Id2032a43727e7f1fa5163333d3565354d412a561
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -3
index 3efd59e984a3..6ba5f328249d 100644
@@ -1191,14 +1191,14 @@ static int vega20_set_sclk_od(
 			&(data->dpm_table.gfx_table);
 	struct vega20_single_dpm_table *golden_sclk_table =
 			&(data->golden_dpm_table.gfx_table);
-	uint32_t od_sclk;
+	uint64_t od_sclk;
 	int ret = 0;
 
 	od_sclk = golden_sclk_table->dpm_levels[golden_sclk_table->count
- 1].value * value;
 	do_div(od_sclk, 100);
 	od_sclk += golden_sclk_table->dpm_levels[golden_sclk_table-
 >count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr,
 OD8_SETTING_GFXCLK_FMAX, od_sclk);
+	ret = vega20_od8_set_settings(hwmgr,

OD8_SETTING_GFXCLK_FMAX, (uint32_t)od_sclk);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -2
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetSclkOD] failed to set od gfxclk!",
 			return ret);
@@ -1238,14 +1238,14 @@ static int vega20_set_mclk_od(
 			&(data->dpm_table.mem_table);
 	struct vega20_single_dpm_table *golden_mclk_table =
 			&(data->golden_dpm_table.mem_table);
-	uint32_t od_mclk;
+	uint64_t od_mclk;
 	int ret = 0;
 
 	od_mclk = golden_mclk_table->dpm_levels[golden_mclk_table-
 >count - 1].value * value;
 	do_div(od_mclk, 100);
 	od_mclk += golden_mclk_table->dpm_levels[golden_mclk_table-
 >count - 1].value;
 
-	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX,
 od_mclk);
+	ret = vega20_od8_set_settings(hwmgr, OD8_SETTING_UCLK_FMAX,

(uint32_t)od_mclk);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"[SetMclkOD] failed to set od memclk!",
 			return ret);
--

2.18.0

Quoted 4 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx