Skip to contentSkip to conversation

drm/amd/display: Disable -Wenum-float-conversion for dml2_dpmm_dcn4.c

PATCH In review Nathan Chancellor 2 participants 5 messages Dec 19, 2024 – Feb 14, 2025

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

PATCH 1/1 drm/amd/display: Disable -Wenum-float-conversion for dml2_dpmm_dcn4.c

Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply 2fde4fdddc1f"), which itself was a reapplication for the same reason, which results in that compiler warning returning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]

    215 |         divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
        |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~

Just disable the warning for the whole file via Makefile to avoid having to reapply the same fix every time the code syncs from wherever it is actually maintained.

Fixes be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes")

---
If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied.

---
 drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/Makefile +1 -1
index d9c27ebe12ee08d6330eb199cd8ca9c8489fa5b2..5c0f93644c5d43c8a0bc12713fc400712d8de50b 100644
@@ -78,7 +78,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.o := $(dml2_ccfla
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.o := $(dml2_ccflags) $(frame_warn_flag)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_factory.o := $(dml2_ccflags)
-CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags)
+CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) $(call cc-disable-warning,enum-float-conversion)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.o := $(dml2_ccflags)

---
base-commit: 695c2c745e5dff201b75da8a1d237ce403600d04
change-id: 20241219-amdgpu-fix-enum-float-conversion-again-again-cbfd9159f76d

Best regards,

Signature · 1 line
Nathan Chancellor <[email protected]>
#1 lore raw
Quoted 14 lines · Nathan Chancellor

Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply 2fde4fdddc1f"), which itself was a reapplication for the same reason, which results in that compiler warning returning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]

    215 |         divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
        |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~

Just disable the warning for the whole file via Makefile to avoid having to reapply the same fix every time the code syncs from wherever it is actually maintained.

Quoted 6 lines
Fixes be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes")

---
If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied.

I've reapplied the original fix and I've confirmed that the fix will be pushed to the DML tree as well this time.

Thanks,

Alex

Quoted 26 lines
---
 drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/Makefile +1 -2
index d9c27ebe12ee08d6330eb199cd8ca9c8489fa5b2..5c0f93644c5d43c8a0bc12713fc400712d8de50b 100644
@@ -78,7 +78,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.o := $(dml2_ccfla
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.o := $(dml2_ccflags) $(frame_warn_flag)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_core/dml2_core_factory.o := $(dml2_ccflags)
-CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags)
+CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.o := $(dml2_ccflags) $(call cc-disable-warning,enum-float-conversion)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.o := $(dml2_ccflags)
 
---

base-commit: 695c2c745e5dff201b75da8a1d237ce403600d04
change-id: 20241219-amdgpu-fix-enum-float-conversion-again-again-cbfd9159f76d

Best regards,
--
Nathan Chancellor <[email protected]>

#2 lore raw
Quoted 7 lines · Alex Deucher
Quoted 3 lines · Nathan Chancellor

If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied.

I've reapplied the original fix and I've confirmed that the fix will be pushed to the DML tree as well this time.

Thanks a lot!

#3 lore raw
In reply to Alex Deucher
Quoted 22 lines · Alex Deucher
Quoted 14 lines · Nathan Chancellor

Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply 2fde4fdddc1f"), which itself was a reapplication for the same reason, which results in that compiler warning returning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]

    215 |         divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
        |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~

Just disable the warning for the whole file via Makefile to avoid having to reapply the same fix every time the code syncs from wherever it is actually maintained.

Quoted 6 lines
Fixes be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes")

---
If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied.

Quoted 2 lines

I've reapplied the original fix and I've confirmed that the fix will be pushed to the DML tree as well this time.

Did that actually end up happening? Commit 1b30456150e5 ("drm/amd/display: DML21 Reintegration") in next-20250214 reintroduces this warning... I guess it may be a timing thing because the author date is three weeks ago or so. Should I send my "Reapply" patch or will you take care of it?

Cheers,
Nathan

#4 lore raw
Quoted 24 lines · Nathan Chancellor
Quoted 22 lines · Alex Deucher
Quoted 20 lines · Nathan Chancellor

Commit be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes") blew away commit fdedd77b0eb3 ("drm/amd/display: Reapply 2fde4fdddc1f"), which itself was a reapplication for the same reason, which results in that compiler warning returning:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:215:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]

    215 |         divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
        |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~

Just disable the warning for the whole file via Makefile to avoid having to reapply the same fix every time the code syncs from wherever it is actually maintained.

Fixes be4e3509314a ("drm/amd/display: DML21 Reintegration For Various Fixes")

---
If you would prefer reapplying the local fix, feel free to do so, but I would like for it to be in the upstream source so it does not have to keep being applied.

Quoted 8 lines
Quoted 2 lines

I've reapplied the original fix and I've confirmed that the fix will be pushed to the DML tree as well this time.

Did that actually end up happening? Commit 1b30456150e5 ("drm/amd/display: DML21 Reintegration") in next-20250214 reintroduces this warning... I guess it may be a timing thing because the author date is three weeks ago or so. Should I send my "Reapply" patch or will you take care of it?

<sigh> I'll reapply. Come on guys. Please make sure this makes it's way into the DML code this time if it hasn't already.

Thanks,

Alex