Skip to contentSkip to conversation

amdgpu/dc: Add missing cast in dce_clock_set_min_clocks_state()

PATCH In review Matthias Kaehlcke 2 participants 3 messages Feb 9, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 amdgpu/dc: Add missing cast in dce_clock_set_min_clocks_state()

dce_clock_set_min_clocks_state() assigns (intentionally) a value of type 'enum dm_pp_clocks_state' to a variable of type 'enum dm_pp_power_level' without an explicit cast. This causes clang to raise the following warning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_clocks.c:308:4: error:
implicit conversion from enumeration type 'enum dm_pp_clocks_state' to different enumeration type 'enum dm_pp_power_level' [-Werror,-Wenum-conversion]

    clocks_state };

Make the cast explicit.

---
 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +2 -1
index 9e98a5f39a6d..db3ceb283255 100644
@@ -304,7 +304,8 @@ static bool dce_clock_set_min_clocks_state(
 	enum dm_pp_clocks_state clocks_state)
 {
 	struct dm_pp_power_level_change_request level_change_req = {
-			clocks_state };
+		.power_level = (enum dm_pp_power_level)clocks_state
+	};
 
 	if (clocks_state > clk->max_clks_state) {
 		/*Requested state exceeds max supported state.*/
Signature · 6 lines
2.16.0.rc1.238.g530d649a79-goog

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer
#1 lore raw
Quoted 22 lines · Matthias Kaehlcke

dce_clock_set_min_clocks_state() assigns (intentionally) a value of type 'enum dm_pp_clocks_state' to a variable of type 'enum dm_pp_power_level' without an explicit cast. This causes clang to raise the following warning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_clocks.c:308:4: error:
implicit conversion from enumeration type 'enum dm_pp_clocks_state' to different enumeration type 'enum dm_pp_power_level' [-Werror,-Wenum-conversion]

    clocks_state };

Make the cast explicit.

---
 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +0 -0
index 9e98a5f39a6d..db3ceb283255 100644

drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c static bool dce_clock_set_min_clocks_state( · line 307

Quoted 5 lines
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +1 -1
@@ -304,7 +304,8 @@ static bool dce_clock_set_min_clocks_state(
 	enum dm_pp_clocks_state clocks_state)
 {
 	struct dm_pp_power_level_change_request level_change_req = {
-			clocks_state };
+		.power_level = (enum dm_pp_power_level)clocks_state

Thanks for spotting this. Looks like both enums are exactly the same so no need to keep both. I sent a patch to remove the dm_pp_power_level enum to amd-gfx and CC'd you on it.

Harry

drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c static bool dce_clock_set_min_clocks_state( · line 311

Quoted 5 lines
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +1 -0
+	};
 
 	if (clocks_state > clk->max_clks_state) {
 		/*Requested state exceeds max supported state.*/

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

#2 lore raw

El Fri, Feb 09, 2018 at 04:55:57PM -0500 Harry Wentland ha dit:

Quoted 18 lines · Matthias Kaehlcke
Quoted 17 lines

dce_clock_set_min_clocks_state() assigns (intentionally) a value of type 'enum dm_pp_clocks_state' to a variable of type 'enum dm_pp_power_level' without an explicit cast. This causes clang to raise the following warning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_clocks.c:308:4: error:
implicit conversion from enumeration type 'enum dm_pp_clocks_state' to different enumeration type 'enum dm_pp_power_level' [-Werror,-Wenum-conversion]

    clocks_state };

Make the cast explicit.

---
 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 12 lines

drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c static bool dce_clock_set_min_clocks_state( · line 307

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +1 -1
index 9e98a5f39a6d..db3ceb283255 100644
@@ -304,7 +304,8 @@ static bool dce_clock_set_min_clocks_state(
 	enum dm_pp_clocks_state clocks_state)
 {
 	struct dm_pp_power_level_change_request level_change_req = {
-			clocks_state };
+		.power_level = (enum dm_pp_power_level)clocks_state

Thanks for spotting this. Looks like both enums are exactly the same so no need to keep both. I sent a patch to remove the dm_pp_power_level enum to amd-gfx and CC'd you on it.

Even better, thanks!
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel